Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jing-trang for openSUSE:Factory checked in at 2021-07-04 22:10:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jing-trang (Old) and /work/SRC/openSUSE:Factory/.jing-trang.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jing-trang" Sun Jul 4 22:10:40 2021 rev:5 rq:903702 version:20181222 Changes: -------- --- /work/SRC/openSUSE:Factory/jing-trang/jing-trang.changes 2018-12-14 20:44:12.801772323 +0100 +++ /work/SRC/openSUSE:Factory/.jing-trang.new.2625/jing-trang.changes 2021-07-04 22:10:43.673236016 +0200 @@ -1,0 +2,28 @@ +Fri Jul 2 11:40:01 UTC 2021 - Fridrich Strba <[email protected]> + +- Added patch: + * old-saxon.patch + + Avoid building old saxon validator in order to avoid + dependency on old saxon6 + +------------------------------------------------------------------- +Fri Jul 2 09:21:15 UTC 2021 - Fridrich Strba <[email protected]> + +- Do not use xmvn-tools, since this is a ring package +- Added patch: + * no-tests.patch + + avoid unnecessary dependency on testng + +------------------------------------------------------------------- +Sun Jun 27 18:54:26 UTC 2021 - Anton Shvetz <[email protected]> + +- Update to v20181222 +- Package maven metadata +- Use testng in build process +- Remove unneeded patches: + * jing-trang-20091111-datatype-sample.patch + * jing-trang-20151127-notestng.patch +- Modified patch: + * 0001-Various-build-fixes.patch -> 0000-Various-build-fixes.patch + +------------------------------------------------------------------- Old: ---- 0001-Various-build-fixes.patch V20151127.tar.gz jing-trang-20091111-datatype-sample.patch jing-trang-20151127-notestng.patch New: ---- 0000-Various-build-fixes.patch 1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip V20181222.tar.gz _service jing-20181222.pom no-tests.patch old-saxon.patch trang-20181222.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jing-trang.spec ++++++ --- /var/tmp/diff_new_pack.PcuGDK/_old 2021-07-04 22:10:44.449230014 +0200 +++ /var/tmp/diff_new_pack.PcuGDK/_new 2021-07-04 22:10:44.453229983 +0200 @@ -1,7 +1,7 @@ # # spec file for package jing-trang # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,32 @@ # +%global relaxng_hash 1fc8c8d337c2c75b6b15b281f2c69e86110e475f Name: jing-trang -Version: 20151127 +Version: 20181222 Release: 0 Summary: Schema validation and conversion based on RELAX NG License: BSD-3-Clause Group: Productivity/Text/Utilities -Url: https://github.com/relaxng/jing-trang -Source0: https://github.com/relaxng/jing-trang/archive/V%{version}.tar.gz -Source1: dtdinst.1 +URL: https://github.com/relaxng/%{name} +Source0: https://github.com/relaxng/%{name}/archive/V%{version}.tar.gz +Source1: https://github.com/relaxng/relaxng.org/archive/%{relaxng_hash}.zip +Source2: https://repo1.maven.org/maven2/org/relaxng/jing/%{version}/jing-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/relaxng/trang/%{version}/trang-%{version}.pom +Source10: dtdinst.1 # -Patch0: 0001-Various-build-fixes.patch +Patch0: 0000-Various-build-fixes.patch Patch1: 0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch -Patch2: %{name}-20091111-datatype-sample.patch -Patch3: %{name}-%{version}-notestng.patch +Patch2: no-tests.patch +Patch3: old-saxon.patch BuildRequires: ant >= 1.8.2 # BuildRequires: bsh2 BuildRequires: fdupes BuildRequires: isorelax -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javacc -BuildRequires: jpackage-utils +BuildRequires: javapackages-local BuildRequires: qdox BuildRequires: relaxngDatatype >= 2011.1 BuildRequires: saxon9 @@ -45,6 +49,7 @@ BuildRequires: xalan-j2 BuildRequires: xml-commons-apis BuildRequires: xml-commons-resolver +# BuildArch: noarch %description @@ -58,10 +63,8 @@ Group: Productivity/Text/Utilities Requires: java-headless Requires: jpackage-utils -Requires: relaxngDatatype -Requires: xerces-j2 -Requires: xml-commons-resolver -Recommends: saxon9 +Requires: mvn(com.github.relaxng:relaxngDatatype) >= 2011.1 +Requires: mvn(xml-resolver:xml-resolver) %description -n jing jing is an XML validator implemented in Java. It validates against the @@ -90,32 +93,35 @@ Group: Productivity/Text/Utilities Requires: java-headless Requires: jpackage-utils -Requires: relaxngDatatype -Requires: xerces-j2 -Requires: xml-commons-resolver +Requires: mvn(com.github.relaxng:relaxngDatatype) >= 2011.1 +Requires: mvn(xerces:xercesImpl) +Requires: mvn(xml-resolver:xml-resolver) %description -n trang -Trang converts between different schema languages for XML. It -supports the following languages: RELAX NG (both XML and compact -syntax), XML 1.0 DTDs, W3C XML Schema. A schema written in any of the -supported schema languages can be converted into any of the other -supported schema languages, except that W3C XML Schema is supported -for output only, not for input. +Trang converts between different schema languages for XML. It supports the +following languages: RELAX NG (both XML and compact syntax), XML 1.0 DTDs, W3C +XML Schema. A schema written in any of the supported schema languages can be +converted into any of the other supported schema languages, except that W3C XML +Schema is supported for output only, not for input. %package -n dtdinst Summary: XML DTD to XML instance format converter Group: Productivity/Text/Utilities -Requires: java-headless >= 1.5.0 +Requires: java-headless Requires: jpackage-utils %description -n dtdinst -DTDinst is a program for converting XML DTDs into an XML instance -format. +DTDinst is a program for converting XML DTDs into an XML instance format. %prep -%setup -q - -cp %{SOURCE1} . +%setup -q -a 0 +rmdir relaxng.org +unzip %{SOURCE1} +mv relaxng.org-%{relaxng_hash} relaxng.org + +cp %{SOURCE2} jing.pom +cp %{SOURCE3} trang.pom +cp %{SOURCE10} . mv gcj/{trang,jing}.1 . rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar") @@ -123,31 +129,55 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +rm -f \ + mod/schematron/src/main/com/thaiopensource/validate/schematron/OldSaxonSchemaReaderFactory.java sed -i -e 's/\r//g' lib/isorelax.copying.txt -find . -name "OldSaxon*.java" -delete # No "old" saxon available in SUSE sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/dtdinst/\1"|' \ dtdinst/index.html sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/trang/\1"|' \ trang/doc/trang.html trang/doc/trang-manual.html +# The saxon9 package provides mvn(net.sf.saxon:saxon) +# instead of mvn(net.sf.saxon:Saxon-HE) +%pom_remove_dep net.sf.saxon:Saxon-HE jing.pom +%pom_add_dep net.sf.saxon:saxon jing.pom + %build CLASSPATH=$(build-classpath \ - xalan-j2 xalan-j2-serializer xerces-j2 xml-commons-apis saxon9 relaxngDatatype) \ + xalan-j2 xalan-j2-serializer xerces-j2 xml-commons-apis \ + saxon9 relaxngDatatype) \ %{ant} \ -Dlib.dir=%{_javadir} -Dbuild.sysclasspath=last \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ dist %install -rm -rf %{buildroot} *-%{version} - -install -dm 755 $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir},%{_mandir}/man1} +install -dm 0755 %{buildroot}{%{_mandir}/man1,%{_javadocdir}} unzip build/dist/jing-%{version}.zip -install -Dpm 644 jing-%{version}/bin/jing.jar %{buildroot}%{_javadir} -mv jing-%{version}/doc/api %{buildroot}%{_javadocdir}/jing +unzip build/dist/trang-%{version}.zip +unzip build/dist/dtdinst-%{version}.zip rm -f jing-%{version}/sample/datatype/datatype-sample.jar +# JAR artifacts +install -dm 0755 %{buildroot}%{_javadir} +install -dm 0755 %{buildroot}%{_mavenpomdir} + +install -pm 0644 jing-%{version}/bin/jing.jar %{buildroot}%{_javadir}/jing.jar +install -pm 0644 jing.pom %{buildroot}%{_mavenpomdir}/jing.pom +%add_maven_depmap jing.pom jing.jar -f jing + +install -pm 0644 trang-%{version}/trang.jar %{buildroot}%{_javadir}/trang.jar +install -pm 0644 trang.pom %{buildroot}%{_mavenpomdir}/trang.pom +%add_maven_depmap trang.pom trang.jar -f trang + +install -pm 0644 dtdinst-%{version}/dtdinst.jar %{buildroot}%{_javadir}/dtdinst.jar +%add_maven_depmap org.relaxng:dtdinst:%{version} dtdinst.jar -f dtdinst + +# API cocumentation +mv jing-%{version}/doc/api %{buildroot}%{_javadocdir}/jing +%fdupes %{buildroot}%{_javadocdir} + # We need to redefine name here to make jpackage_script aware of # the correct name, otherwise it would use "jing-trang" in configuration names etc. %define name jing @@ -155,46 +185,37 @@ mkdir -p jing-%{version}/_licenses mv jing-%{version}/doc/*copying.* jing-%{version}/_licenses -unzip build/dist/trang-%{version}.zip -install -pm 644 trang-%{version}/trang.jar %{buildroot}%{_javadir} %define name trang %jpackage_script com.thaiopensource.relaxng.translate.Driver "" "" trang:relaxngDatatype:xml-commons-resolver:xerces-j2 trang true -unzip build/dist/dtdinst-%{version}.zip -install -pm 644 dtdinst-%{version}/dtdinst.jar %{buildroot}%{_javadir} %define name dtdinst %jpackage_script com.thaiopensource.xml.dtd.app.Driver "" "" dtdinst dtdinst true # Install manpages and replace @VERSION@ -install -D -m 0644 {dtdinst,jing,trang}.1 %{buildroot}%{_mandir}/man1/ +install -Dm0644 {dtdinst,jing,trang}.1 %{buildroot}%{_mandir}/man1/ sed -i 's/@VERSION@/%{version}/g' %{buildroot}%{_mandir}/man1/*.1 -%fdupes %{buildroot}%{_javadocdir} - -%files -n jing +%files -n jing -f .mfiles-jing %license jing-%{version}/_licenses/* %doc jing-%{version}/{readme.html,doc,sample} -%{_mandir}/man1/jing.1%{ext_man} +%{_mandir}/man1/jing.1%{?ext_man} %{_bindir}/jing -%{_javadir}/jing.jar %files -n jing-javadoc +%{_javadocdir}/jing %license jing-%{version}/_licenses/* -%{_javadocdir}/jing/ -%files -n trang +%files -n trang -f .mfiles-trang %license trang-%{version}/copying.txt %doc trang-%{version}/*.html %{_bindir}/trang -%{_javadir}/trang.jar -%{_mandir}/man1/trang.1%{ext_man} +%{_mandir}/man1/trang.1%{?ext_man} -%files -n dtdinst +%files -n dtdinst -f .mfiles-dtdinst %license dtdinst-%{version}/copying.txt %doc dtdinst-%{version}/*.{html,rng,xsl} %doc dtdinst-%{version}/{dtdinst.rnc.txt,teixml.dtd.txt,example} %{_bindir}/dtdinst -%{_javadir}/dtdinst.jar -%{_mandir}/man1/dtdinst.1%{ext_man} +%{_mandir}/man1/dtdinst.1%{?ext_man} %changelog ++++++ 0001-Various-build-fixes.patch -> 0000-Various-build-fixes.patch ++++++ --- /work/SRC/openSUSE:Factory/jing-trang/0001-Various-build-fixes.patch 2017-12-06 14:46:27.526037600 +0100 +++ /work/SRC/openSUSE:Factory/.jing-trang.new.2625/0000-Various-build-fixes.patch 2021-07-04 22:10:43.397238150 +0200 @@ -1,172 +1,108 @@ -From 212c793fe0f4b9e352e2ae9949beb187e77abe68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <[email protected]> -Date: Mon, 9 Jun 2014 09:54:16 +0300 -Subject: [PATCH 1/2] Various build fixes - ---- - build.xml | 19 ++++++++----------- - build.xsl | 28 ++++++++++++++++++---------- - mod/catalog/mod.xml | 2 +- - mod/datatype/mod.xml | 1 + - mod/jing/mod.xml | 2 -- - mod/pattern/mod.xml | 1 + - mod/regex/mod.xml | 2 +- - mod/rng-jaxp/mod.xml | 1 + - mod/rng-validate/mod.xml | 2 +- - mod/schematron/mod.xml | 8 ++------ - mod/trang/mod.xml | 3 +-- - mod/xerces/mod.xml | 2 +- - mod/xsd-datatype/mod.xml | 1 + - 13 files changed, 37 insertions(+), 35 deletions(-) - -diff --git a/build.xml b/build.xml -index a2bc499..ee0f061 100644 ---- a/build.xml -+++ b/build.xml -@@ -145,22 +145,19 @@ - - <target name="javadoc" depends="init"> - <mkdir dir="${build.dir}/api"/> -- <mkdir dir="${build.dir}/api/datatype"/> - <mkdir dir="${build.dir}/api/jing"/> - <mkdir dir="${build.dir}/api/regex"/> -- <javadoc sourcepath="mod/datatype/src/main" destdir="${build.dir}/api/datatype" -- doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API" -- packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers"/> - <javadoc sourcepath="mod/util/src/main:mod/regex/src/main" destdir="${build.dir}/api/regex" - packagenames="com.thaiopensource.datatype.xsd.regex, - com.thaiopensource.datatype.xsd.regex.java, -- com.thaiopensource.datatype.xsd.regex.xerces2"/> -+ com.thaiopensource.datatype.xsd.regex.xerces2"> -+ <link href="/usr/share/javadoc/java"/> -+ </javadoc> - <javadoc sourcepathref="javadoc.sourcepath" destdir="${build.dir}/api/jing" - doctitle="Jing API" windowtitle="Jing API" - packagenames="${javadoc.packagenames}"> -- <link offline="true" href="../datatype" packagelistLoc="${build.dir}/api/datatype"/> -- <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"; -- packagelistLoc="extapidoc/jdk/1.5"/> -+ <link href="/usr/share/javadoc/java"/> -+ <link href="/usr/share/javadoc/relaxngDatatype"/> - </javadoc> - </target> - -@@ -170,7 +167,7 @@ - destdir="${build.dir}/doccheck" - packagenames="${javadoc.packagenames}" - doclet="com.sun.tools.doclets.doccheck.DocCheck" -- docletpath="lib/doccheck.jar"/> -+ docletpath="${lib.dir}/doccheck.jar"/> +diff -up jing-trang-20181222/build.xml.fix jing-trang-20181222/build.xml +--- jing-trang-20181222/build.xml.fix 2021-06-27 13:22:19.392361564 +0300 ++++ jing-trang-20181222/build.xml 2021-06-27 14:52:11.847571826 +0300 +@@ -152,7 +152,8 @@ + <javadoc sourcepath="mod/datatype/src/main" destdir="${build.dir}/api/datatype" + additionalparam="-html5 -Xdoclint:none" + doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API" +- packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers"> ++ > ++ <!--packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers"> --> + <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"; + packagelistLoc="extapidoc/jdk/1.5"/> + <classpath> +@@ -428,18 +429,7 @@ + labels="Type-Archive, OpSys-All, Version-${version}"/> </target> - <target name="datatype-sample" depends="jar"> -@@ -290,7 +287,7 @@ - <java classname="com.thaiopensource.relaxng.translate.Driver" - fork="true" - failonerror="yes" -- classpath="${build.dir}/trang.jar"> -+ classpath="${build.dir}/trang.jar:/usr/share/java/relaxngDatatype.jar"> - <arg value="dtdinst/dtdinst.rnc"/> - <arg value="${build.dir}/dtdinst/dtdinst.rng"/> - </java> -@@ -360,7 +357,7 @@ - depends="version,googlecode.properties" - description="Upload files to Google Code. Run dist before this."> - <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" -- classpath="lib/ant-googlecode.jar" name="gcupload"/> -+ classpath="${lib.dir}/ant-googlecode.jar" name="gcupload"/> - <gcupload username="${googlecode.username}" - password="${googlecode.password}" - projectname="jing-trang" -diff --git a/build.xsl b/build.xsl -index d76508f..e084fca 100644 ---- a/build.xsl -+++ b/build.xsl -@@ -10,12 +10,12 @@ - <project> - <xmlproperty file="version.xml"/> - <property name="build.dir" value="${{basedir}}/build"/> -- <property name="javacc.dir" value="lib"/> -+ <property name="javacc.dir" value="${{lib.dir}}"/> - <property name="ant.build.javac.source" value="1.5"/> - <property name="ant.build.javac.target" value="1.5"/> - <taskdef name="testng" classname="org.testng.TestNGAntTask"> - <classpath> -- <pathelement location="lib/testng.jar"/> -+ <pathelement location="${{lib.dir}}/testng.jar"/> - </classpath> - </taskdef> +-<target name="clean" +- description="Remove almost all files created during the build process"> +- <delete dir="${build.dir}"/> +- <exec executable="git"> +- <arg value="clean"/> +- <arg value="-d"/> +- <arg value="--force"/> +- <arg value="${doc.dir}"/> +- </exec> +-</target> +- +-<target name="realclean" depends="clean" ++<target name="realclean" + description="Remove all files created during the build process"> + <delete> + <fileset dir="mod" includes="*/*.iml"/> +diff -up jing-trang-20181222/build.xsl.fix jing-trang-20181222/build.xsl +--- jing-trang-20181222/build.xsl.fix 2021-06-27 13:36:13.594166963 +0300 ++++ jing-trang-20181222/build.xsl 2021-06-27 19:53:56.176573385 +0300 +@@ -23,12 +23,6 @@ <target name="dummy"/> -@@ -111,7 +111,7 @@ - <pathelement location="{$build}/mod/{@module}/classes/main"/> - </xsl:for-each> - <xsl:for-each select="depends[@lib]"> -- <pathelement location="lib/{@lib}.jar"/> -+ <pathelement location="${{lib.dir}}/{@lib}.jar"/> - </xsl:for-each> - </classpath> - </javac> -@@ -151,10 +151,10 @@ - <pathelement location="{$build}/mod/{@module}/classes/main"/> - </xsl:for-each> - <xsl:for-each select="depends[@lib]"> -- <pathelement location="lib/{@lib}.jar"/> -+ <pathelement location="${{lib.dir}}/{@lib}.jar"/> + <target name="init"> + <mkdir dir="{$build}"/> +- <exec executable="git"> +- <arg value="submodule"/> +- <arg value="update"/> +- <arg value="--init"/> +- <arg value="--recursive"/> +- </exec> + <copy todir="{$doc}"> + <fileset dir="relaxng.org/jclark" includes="**"/> + </copy> +@@ -165,7 +159,6 @@ + <pathelement location="${{lib.dir}}/{@lib}.jar"/> </xsl:for-each> <xsl:if test="test[@type='testng']"> -- <pathelement location="lib/testng.jar"/> -+ <pathelement location="${{lib.dir}}/testng.jar"/> +- <pathelement location="${{lib.dir}}/testng.jar"/> </xsl:if> </classpath> </javac> -@@ -298,13 +298,18 @@ - <classpath> - <pathelement location="{$build}/{$app}.jar"/> +@@ -311,11 +304,12 @@ <xsl:if test="@lib"> -- <pathelement location="lib/{@lib}.jar"/> -+ <pathelement location="${{lib.dir}}/{@lib}.jar"/> + <pathelement location="${{lib.dir}}/{@lib}.jar"/> <xsl:if test="@lib='xalan'"> -- <pathelement location="lib/serializer.jar"/> +- <pathelement location="${{lib.dir}}/serializer.jar"/> + <pathelement location="${{lib.dir}}/xalan-j2-serializer.jar"/> </xsl:if> </xsl:if> -+ <!-- Upstream build assumes Class-Path in jing, trang manifests --> <xsl:if test="$app = 'jing'"> -- <pathelement location="lib/xercesImpl.jar"/> +- <pathelement location="${{lib.dir}}/xercesImpl.jar"/> + <pathelement location="${{lib.dir}}/xerces-j2.jar"/> + <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/> -+ </xsl:if> -+ <xsl:if test="$app = 'trang'"> -+ <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/> </xsl:if> </classpath> </java> -@@ -373,7 +378,7 @@ - <pathelement location="mod/{@module}/src/main"/> - </xsl:for-each> - <xsl:for-each select="../depends[@lib]"> -- <pathelement location="lib/{@lib}.jar"/> -+ <pathelement location="${{lib.dir}}/{@lib}.jar"/> - </xsl:for-each> - </classpath> - </java> -@@ -402,8 +407,11 @@ - <pathelement location="mod/{@module}/src/main"/> - </xsl:for-each> +@@ -415,6 +409,9 @@ <xsl:for-each select="../depends[@lib]"> -- <pathelement location="lib/{@lib}.jar"/> -+ <pathelement location="${{lib.dir}}/{@lib}.jar"/> + <pathelement location="${{lib.dir}}/{@lib}.jar"/> </xsl:for-each> + <!-- Upstream testng.jar includes bsh and qdox --> -+ <pathelement location="${{lib.dir}}/bsh.jar"/> -+ <pathelement location="${{lib.dir}}/qdox.jar"/> ++ <pathelement location="${{lib.dir}}/bsh.jar"/> ++ <pathelement location="${{lib.dir}}/qdox.jar"/> </classpath> </testng> </target> -diff --git a/mod/catalog/mod.xml b/mod/catalog/mod.xml -index c8e2feb..5398646 100644 ---- a/mod/catalog/mod.xml -+++ b/mod/catalog/mod.xml +diff -up jing-trang-20181222/datatype-sample/build.xml.fix jing-trang-20181222/datatype-sample/build.xml +--- jing-trang-20181222/datatype-sample/build.xml.fix 2021-06-27 20:51:29.945542964 +0300 ++++ jing-trang-20181222/datatype-sample/build.xml 2021-06-27 20:51:59.946177241 +0300 +@@ -2,6 +2,7 @@ + + <property name="build.dir" value="build"/> + <property name="jing.jar" value="jing.jar"/> ++<property name="datatype.jar" value="relaxngDatatype.jar"/> + + <target name="init"> + <mkdir dir="${build.dir}"/> +@@ -9,7 +10,7 @@ + + <target name="compile" depends="init"> + <mkdir dir="${build.dir}/classes"/> +- <javac srcdir="src" destdir="${build.dir}/classes" classpath="${jing.jar}"/> ++ <javac srcdir="src" destdir="${build.dir}/classes" classpath="${datatype.jar}"/> + </target> + + <target name="jar" depends="compile"> +diff -up jing-trang-20181222/mod/catalog/mod.xml.fix jing-trang-20181222/mod/catalog/mod.xml +--- jing-trang-20181222/mod/catalog/mod.xml.fix 2021-06-27 19:39:16.877996996 +0300 ++++ jing-trang-20181222/mod/catalog/mod.xml 2021-06-27 19:39:41.998527709 +0300 @@ -3,5 +3,5 @@ <test name="unit" type="testng"/> <depends module="util"/> @@ -174,20 +110,18 @@ - <depends lib="resolver"/> + <depends lib="xml-commons-resolver"/> </module> -diff --git a/mod/datatype/mod.xml b/mod/datatype/mod.xml -index cd79499..cdb420a 100644 ---- a/mod/datatype/mod.xml -+++ b/mod/datatype/mod.xml +diff -up jing-trang-20181222/mod/datatype/mod.xml.fix jing-trang-20181222/mod/datatype/mod.xml +--- jing-trang-20181222/mod/datatype/mod.xml.fix 2021-06-27 19:38:37.897173469 +0300 ++++ jing-trang-20181222/mod/datatype/mod.xml 2021-06-27 19:38:56.329562870 +0300 @@ -1,4 +1,5 @@ <module> <depends module="util"/> + <depends lib="relaxngDatatype"/> <compile/> </module> -diff --git a/mod/jing/mod.xml b/mod/jing/mod.xml -index 86583f8..8b2ec82 100644 ---- a/mod/jing/mod.xml -+++ b/mod/jing/mod.xml +diff -up jing-trang-20181222/mod/jing/mod.xml.fix jing-trang-20181222/mod/jing/mod.xml +--- jing-trang-20181222/mod/jing/mod.xml.fix 2021-06-27 15:35:37.171239266 +0300 ++++ jing-trang-20181222/mod/jing/mod.xml 2021-06-27 15:35:57.163667091 +0300 @@ -21,8 +21,6 @@ <jar> <manifest> @@ -197,10 +131,9 @@ </manifest> <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine"/> <service type="org.relaxng.datatype.DatatypeLibraryFactory"/> -diff --git a/mod/pattern/mod.xml b/mod/pattern/mod.xml -index 777f484..875f1cb 100644 ---- a/mod/pattern/mod.xml -+++ b/mod/pattern/mod.xml +diff -up jing-trang-20181222/mod/pattern/mod.xml.fix jing-trang-20181222/mod/pattern/mod.xml +--- jing-trang-20181222/mod/pattern/mod.xml.fix 2021-06-27 19:37:53.488235284 +0300 ++++ jing-trang-20181222/mod/pattern/mod.xml 2021-06-27 19:38:11.800622151 +0300 @@ -3,6 +3,7 @@ <depends module="resolver"/> <depends module="datatype"/> @@ -209,10 +142,9 @@ <compile test="yes"/> <test name="unit" type="testng"/> </module> -diff --git a/mod/regex/mod.xml b/mod/regex/mod.xml -index 3d1f73f..b682d6d 100644 ---- a/mod/regex/mod.xml -+++ b/mod/regex/mod.xml +diff -up jing-trang-20181222/mod/regex/mod.xml.fix jing-trang-20181222/mod/regex/mod.xml +--- jing-trang-20181222/mod/regex/mod.xml.fix 2021-06-27 14:31:19.700847624 +0300 ++++ jing-trang-20181222/mod/regex/mod.xml 2021-06-27 19:37:25.491643818 +0300 @@ -1,6 +1,6 @@ <module> <depends module="util"/> @@ -221,10 +153,19 @@ <compile test="yes"/> <test name="xerces" type="java" class="com.thaiopensource.datatype.xsd.regex.test.TestDriver"> -diff --git a/mod/rng-jaxp/mod.xml b/mod/rng-jaxp/mod.xml -index 10a8c6d..48c5d8c 100644 ---- a/mod/rng-jaxp/mod.xml -+++ b/mod/rng-jaxp/mod.xml +@@ -46,7 +46,8 @@ + failonerror="yes"> + <arg value="com.thaiopensource.datatype.xsd.regex.java.Categories"/> + <arg value="${build.dir}/mod/regex/gensrc/main"/> +- <arg value="${lib.dir}/UnicodeData-3.1.0.txt"/> ++ <!--arg value="${lib.dir}/UnicodeData-3.1.0.txt"/--> ++ <arg value="lib/UnicodeData-3.1.0.txt"/> + <classpath> + <pathelement location="${build.dir}/mod/regex-gen/classes/main"/> + <pathelement location="${build.dir}/mod/util/classes/main"/> +diff -up jing-trang-20181222/mod/rng-jaxp/mod.xml.fix jing-trang-20181222/mod/rng-jaxp/mod.xml +--- jing-trang-20181222/mod/rng-jaxp/mod.xml.fix 2021-06-27 19:36:17.810211941 +0300 ++++ jing-trang-20181222/mod/rng-jaxp/mod.xml 2021-06-27 19:36:39.150663808 +0300 @@ -7,6 +7,7 @@ <depends module="rng-parse"/> <depends module="pattern"/> @@ -233,10 +174,9 @@ <compile test="yes"/> <test name="unit" type="testng"/> </module> -diff --git a/mod/rng-validate/mod.xml b/mod/rng-validate/mod.xml -index 109543b..b05b996 100644 ---- a/mod/rng-validate/mod.xml -+++ b/mod/rng-validate/mod.xml +diff -up jing-trang-20181222/mod/rng-validate/mod.xml.fix jing-trang-20181222/mod/rng-validate/mod.xml +--- jing-trang-20181222/mod/rng-validate/mod.xml.fix 2021-06-27 19:35:27.297142380 +0300 ++++ jing-trang-20181222/mod/rng-validate/mod.xml 2021-06-27 19:35:47.453569174 +0300 @@ -7,7 +7,7 @@ <depends module="pattern"/> <depends module="validate"/> @@ -246,32 +186,21 @@ <test name="spec" type="validate" schema="eg/testSuite.rng"/> <compile/> <version package="com/thaiopensource/relaxng/util"/> -diff --git a/mod/schematron/mod.xml b/mod/schematron/mod.xml -index 51d85cd..3786625 100644 ---- a/mod/schematron/mod.xml -+++ b/mod/schematron/mod.xml -@@ -3,15 +3,11 @@ +diff -up jing-trang-20181222/mod/schematron/mod.xml.fix jing-trang-20181222/mod/schematron/mod.xml +--- jing-trang-20181222/mod/schematron/mod.xml.fix 2021-06-27 18:47:59.700956461 +0300 ++++ jing-trang-20181222/mod/schematron/mod.xml 2021-06-27 19:34:28.267892497 +0300 +@@ -3,7 +3,7 @@ <depends module="resolver"/> <depends module="validate"/> <depends module="rng-validate"/> - <depends lib="xalan"/> + <depends lib="xalan-j2"/> <depends lib="saxon"/> -- <depends lib="saxon9"/> -- <test name="old-saxon" in="mod/schematron/test/schematrontest.xml" -- type="validate" schema="test/schematrontest.nrl" -- lib="saxon"/> - <test name="new-saxon" in="mod/schematron/test/schematrontest.xml" - type="validate" schema="test/schematrontest.nrl" -- lib="saxon9"/> -+ lib="saxon"/> - <test name="xalan" in="mod/schematron/test/schematrontest.xml" - type="validate" schema="test/schematrontest.nrl" - lib="xalan"/> -diff --git a/mod/trang/mod.xml b/mod/trang/mod.xml -index 69b5cc0..fa2d6d0 100644 ---- a/mod/trang/mod.xml -+++ b/mod/trang/mod.xml + <depends lib="saxon9"/> + <test name="old-saxon" in="mod/schematron/test/schematrontest.xml" +diff -up jing-trang-20181222/mod/trang/mod.xml.fix jing-trang-20181222/mod/trang/mod.xml +--- jing-trang-20181222/mod/trang/mod.xml.fix 2021-06-27 18:47:17.064117947 +0300 ++++ jing-trang-20181222/mod/trang/mod.xml 2021-06-27 18:47:26.984313043 +0300 @@ -13,13 +13,12 @@ <depends module="convert-to-xsd"/> <depends module="convert-from-dtd"/> @@ -287,10 +216,9 @@ </manifest> <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine"> <provider classname="com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl"/> -diff --git a/mod/xerces/mod.xml b/mod/xerces/mod.xml -index b7dc603..56bc85f 100644 ---- a/mod/xerces/mod.xml -+++ b/mod/xerces/mod.xml +diff -up jing-trang-20181222/mod/xerces/mod.xml.fix jing-trang-20181222/mod/xerces/mod.xml +--- jing-trang-20181222/mod/xerces/mod.xml.fix 2021-06-27 18:45:15.669730591 +0300 ++++ jing-trang-20181222/mod/xerces/mod.xml 2021-06-27 18:45:44.434296268 +0300 @@ -1,7 +1,7 @@ <module> <depends module="util"/> @@ -300,10 +228,9 @@ <compile/> <service type="com.thaiopensource.validate.SchemaReaderFactory"> <provider classname="com.thaiopensource.validate.xerces.XsdSchemaReaderFactory"/> -diff --git a/mod/xsd-datatype/mod.xml b/mod/xsd-datatype/mod.xml -index f81eb3c..cc7645b 100644 ---- a/mod/xsd-datatype/mod.xml -+++ b/mod/xsd-datatype/mod.xml +diff -up jing-trang-20181222/mod/xsd-datatype/mod.xml.fix jing-trang-20181222/mod/xsd-datatype/mod.xml +--- jing-trang-20181222/mod/xsd-datatype/mod.xml.fix 2021-06-27 18:43:59.364107956 +0300 ++++ jing-trang-20181222/mod/xsd-datatype/mod.xml 2021-06-27 18:44:44.349067255 +0300 @@ -2,6 +2,7 @@ <depends module="util"/> <depends module="datatype"/> @@ -312,6 +239,3 @@ <test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/> <test name="unit" type="testng"/> <compile test="yes"/> --- -1.9.3 - ++++++ V20151127.tar.gz -> V20181222.tar.gz ++++++ /work/SRC/openSUSE:Factory/jing-trang/V20151127.tar.gz /work/SRC/openSUSE:Factory/.jing-trang.new.2625/V20181222.tar.gz differ: char 12, line 1 ++++++ _service ++++++ <services> <service name="download_files" mode="disabled"> <param name="recompress">yes</param> </service> </services> ++++++ dtdinst.1 ++++++ --- /var/tmp/diff_new_pack.PcuGDK/_old 2021-07-04 22:10:44.533229363 +0200 +++ /var/tmp/diff_new_pack.PcuGDK/_new 2021-07-04 22:10:44.537229333 +0200 @@ -1,4 +1,4 @@ -.TH DTDINST "1" "September 2009" "DTDinst" "User Commands" +.TH DTDINST "1" "@VERSION@" "DTDinst" "User Commands" .SH NAME dtdinst \- XML DTD to XML instance format converter .SH SYNOPSIS ++++++ jing-20181222.pom ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <groupId>org.relaxng</groupId> <artifactId>jing</artifactId> <version>20181222</version> <name>Jing</name> <description>Jing, a tool for validating documents against RelaxNG schemas.</description> <url>http://www.thaiopensource.com/relaxng/jing.html</url> <licenses> <license> <name>3-clause BSD license</name> <url>https://github.com/relaxng/jing-trang/blob/master/copying.txt</url> <distribution>repo</distribution> </license> </licenses> <developers> <developer> <id>[email protected]</id> <name>James Clark</name> <email>[email protected]</email> <url>http://jclark.com/</url> </developer> <developer> <id>georgebina</id> <name>George Bina</name> <email>[email protected]</email> <url>http://www.oxygenxml.com</url> </developer> <developer> <id>sideshowbarker</id> <name>Michael[tm] Smith</name> <email>[email protected]</email> <url>https://people.w3.org/mike/</url> </developer> </developers> <issueManagement> <system>GitHub Issues</system> <url>https://github.com/relaxng/jing-trang/issues</url> </issueManagement> <scm> <connection>scm:git:[email protected]:relaxng/jing-trang.git</connection> <developerConnection>scm:git:[email protected]:relaxng/jing-trang.git</developerConnection> <url>https://github.com/relaxng/jing-trang/</url> </scm> <ciManagement> <system>Travis CI</system> <url>https://travis-ci.org/relaxng/jing-trang</url> </ciManagement> <dependencies> <dependency> <groupId>isorelax</groupId> <artifactId>isorelax</artifactId> <version>20030108</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> <version>9.6.0-4</version> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.9.1</version> </dependency> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.0.b2</version> </dependency> </dependencies> </project> ++++++ no-tests.patch ++++++ --- jing-trang-20181222/build.xml 2021-07-01 11:39:52.944475295 +0200 +++ jing-trang-20181222/build.xml 2021-07-01 11:41:13.792611378 +0200 @@ -386,7 +386,7 @@ <gzip zipfile="${build.dir}/dist/relaxng.tar.gz" src="${build.dir}/relaxng.tar"/> </target> -<target name="dist" depends="test,validate,jing-dist,trang-dist,dtdinst-dist,website" +<target name="dist" depends="validate,jing-dist,trang-dist,dtdinst-dist,website" description="Make a distribution, leaving artifacts in ${build.dir}/dist"/> <target name="googlecode.properties.available"> --- jing-trang-20181222/build.xsl 2021-07-01 11:39:52.944475295 +0200 +++ jing-trang-20181222/build.xsl 2021-07-01 11:45:58.721090950 +0200 @@ -15,11 +15,6 @@ <property name="javacc.dir" value="${{lib.dir}}"/> <property name="ant.build.javac.source" value="7"/> <property name="ant.build.javac.target" value="1.7"/> - <taskdef name="testng" classname="org.testng.TestNGAntTask"> - <classpath> - <pathelement location="${{lib.dir}}/testng.jar"/> - </classpath> - </taskdef> <target name="dummy"/> <target name="init"> <mkdir dir="{$build}"/> --- jing-trang-20181222/mod/catalog/mod.xml 2021-07-01 11:39:52.948475302 +0200 +++ jing-trang-20181222/mod/catalog/mod.xml 2021-07-01 11:42:11.328708210 +0200 @@ -1,6 +1,5 @@ <module> - <compile test="yes"/> - <test name="unit" type="testng"/> + <compile test="no"/> <depends module="util"/> <depends module="resolver"/> <depends lib="xml-commons-resolver"/> --- jing-trang-20181222/mod/infer/mod.xml 2021-07-01 11:39:52.960475322 +0200 +++ jing-trang-20181222/mod/infer/mod.xml 2021-07-01 11:42:17.348718337 +0200 @@ -4,6 +4,5 @@ <depends module="datatype"/> <depends module="xsd-datatype"/> <depends module="regex"/> - <compile test="yes"/> - <test name="unit" type="testng"/> + <compile test="no"/> </module> --- jing-trang-20181222/mod/pattern/mod.xml 2021-07-01 11:39:52.960475322 +0200 +++ jing-trang-20181222/mod/pattern/mod.xml 2021-07-01 11:42:23.344728421 +0200 @@ -4,6 +4,5 @@ <depends module="datatype"/> <depends module="rng-parse"/> <depends lib="relaxngDatatype"/> - <compile test="yes"/> - <test name="unit" type="testng"/> + <compile test="no"/> </module> --- jing-trang-20181222/mod/rng-jaxp/mod.xml 2021-07-01 11:39:52.964475329 +0200 +++ jing-trang-20181222/mod/rng-jaxp/mod.xml 2021-07-01 11:42:29.884739430 +0200 @@ -8,6 +8,5 @@ <depends module="pattern"/> <depends module="jaxp"/> <depends lib="relaxngDatatype"/> - <compile test="yes"/> - <test name="unit" type="testng"/> + <compile test="no"/> </module> --- jing-trang-20181222/mod/util/mod.xml 2021-07-01 11:39:52.972475342 +0200 +++ jing-trang-20181222/mod/util/mod.xml 2021-07-01 11:42:35.516748907 +0200 @@ -1,5 +1,4 @@ <module> - <compile test="yes"/> - <test name="unit" type="testng"/> + <compile test="no"/> </module> --- jing-trang-20181222/mod/xsd-datatype/mod.xml 2021-07-01 11:39:52.972475342 +0200 +++ jing-trang-20181222/mod/xsd-datatype/mod.xml 2021-07-01 11:42:48.676771055 +0200 @@ -3,9 +3,7 @@ <depends module="datatype"/> <depends module="regex"/> <depends lib="relaxngDatatype"/> - <test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/> - <test name="unit" type="testng"/> - <compile test="yes"/> + <compile test="no"/> <service type="org.relaxng.datatype.DatatypeLibraryFactory"> <provider classname="com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl"/> </service> ++++++ old-saxon.patch ++++++ --- jing-trang-20181222/mod/schematron/mod.xml 2018-12-21 23:36:19.000000000 +0100 +++ jing-trang-20181222/mod/schematron/mod.xml 2021-07-02 13:29:44.941625566 +0200 @@ -6,9 +6,6 @@ <depends lib="xalan-j2"/> <depends lib="saxon"/> <depends lib="saxon9"/> - <test name="old-saxon" in="mod/schematron/test/schematrontest.xml" - type="validate" schema="test/schematrontest.nrl" - lib="saxon"/> <test name="new-saxon" in="mod/schematron/test/schematrontest.xml" type="validate" schema="test/schematrontest.nrl" lib="saxon9"/> @@ -39,7 +36,6 @@ <compile/> <service type="com.thaiopensource.validate.SchemaReaderFactory"> <provider classname="com.thaiopensource.validate.schematron.NewSaxonSchemaReaderFactory"/> - <provider classname="com.thaiopensource.validate.schematron.OldSaxonSchemaReaderFactory"/> <provider classname="com.thaiopensource.validate.schematron.XalanSchemaReaderFactory"/> <provider classname="com.thaiopensource.validate.schematron.SchematronSchemaReaderFactory"/> </service> ++++++ trang-20181222.pom ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <groupId>org.relaxng</groupId> <artifactId>trang</artifactId> <version>20181222</version> <name>Trang</name> <description>Trang, a multi-format schema converter based on RELAX NG.</description> <url>http://www.thaiopensource.com/relaxng/trang.html</url> <licenses> <license> <name>3-clause BSD license</name> <url>https://github.com/relaxng/jing-trang/blob/master/copying.txt</url> <distribution>repo</distribution> </license> </licenses> <developers> <developer> <id>[email protected]</id> <name>James Clark</name> <email>[email protected]</email> <url>http://jclark.com/</url> </developer> <developer> <id>georgebina</id> <name>George Bina</name> <email>[email protected]</email> <url>http://www.oxygenxml.com</url> </developer> <developer> <id>sideshowbarker</id> <name>Michael[tm] Smith</name> <email>[email protected]</email> <url>https://people.w3.org/mike/</url> </developer> </developers> <issueManagement> <system>GitHub Issues</system> <url>https://github.com/relaxng/jing-trang/issues</url> </issueManagement> <scm> <connection>scm:git:[email protected]:relaxng/jing-trang.git</connection> <developerConnection>scm:git:[email protected]:relaxng/jing-trang.git</developerConnection> <url>https://github.com/relaxng/jing-trang/</url> </scm> <ciManagement> <system>Travis CI</system> <url>https://travis-ci.org/relaxng/jing-trang</url> </ciManagement> </project>
