From c1b5a4ca8820ec498983e86eb7b20fc78e0b0a2ca4d5ee59ce7c76cb1354da76 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 26 Jul 2022 12:51:28 +0000
Subject: [PATCH] Accepting request 991067 from
 home:thomas-schraitle:branches:Java:packages

- Update to 20220510
- Removed patch:
  * 0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
    Use Saxon9 instead of Xalan
- Recreated patch files

OBS-URL: https://build.opensuse.org/request/show/991067
OBS-URL: https://build.opensuse.org/package/show/Java:packages/jing-trang?expand=0&rev=21
---
 0000-Various-build-fixes.patch                | 171 ++++++++++++------
 ...nstead-of-Saxon-for-the-build-655601.patch | 154 ----------------
 V20181222.tar.gz                              |   3 -
 V20220510.tar.gz                              |   3 +
 jing-20181222.pom => jing-20220510.pom        |   2 +-
 jing-trang.changes                            |   9 +
 jing-trang.spec                               |   8 +-
 no-tests.patch                                |  78 +++++---
 trang-20181222.pom => trang-20220510.pom      |   2 +-
 9 files changed, 188 insertions(+), 242 deletions(-)
 delete mode 100644 0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
 delete mode 100644 V20181222.tar.gz
 create mode 100644 V20220510.tar.gz
 rename jing-20181222.pom => jing-20220510.pom (98%)
 rename trang-20181222.pom => trang-20220510.pom (98%)

diff --git a/0000-Various-build-fixes.patch b/0000-Various-build-fixes.patch
index 9d45ee1..6df459c 100644
--- a/0000-Various-build-fixes.patch
+++ b/0000-Various-build-fixes.patch
@@ -1,21 +1,44 @@
-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 @@
+From 62ad89204c223441bf540fb8b4cb5b7b0beba29b Mon Sep 17 00:00:00 2001
+From: Tom Schraitle <tom_schr@web.de>
+Date: Mon, 25 Jul 2022 18:30:18 +0200
+Subject: [PATCH] Various build fixes
+
+---
+ build.xml                 | 15 ++-------------
+ build.xsl                 | 17 +++++++----------
+ datatype-sample/build.xml |  3 ++-
+ mod/catalog/mod.xml       |  2 +-
+ mod/datatype/mod.xml      |  1 +
+ mod/jing/mod.xml          |  2 --
+ mod/pattern/mod.xml       |  1 +
+ mod/regex/mod.xml         |  6 +++---
+ mod/rng-jaxp/mod.xml      |  1 +
+ mod/rng-validate/mod.xml  |  2 +-
+ mod/schematron/mod.xml    |  2 +-
+ mod/trang/mod.xml         |  3 +--
+ mod/xerces/mod.xml        |  2 +-
+ mod/xsd-datatype/mod.xml  |  1 +
+ 14 files changed, 23 insertions(+), 35 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 31c0b64..51c695f 100644
+--- a/build.xml
++++ b/build.xml
+@@ -161,8 +161,7 @@
+   <mkdir dir="${build.dir}/api/regex"/>
    <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"
+-    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"> -->
++    doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API">
      <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"
  	  packagelistLoc="extapidoc/jdk/1.5"/>
      <classpath>
-@@ -428,18 +429,7 @@
+@@ -453,18 +452,8 @@
              labels="Type-Archive, OpSys-All, Version-${version}"/>
  </target>
  
--<target name="clean" 
+-<target name="ant-clean"
 -	description="Remove almost all files created during the build process">
 -  <delete dir="${build.dir}"/>
 -  <exec executable="git">
@@ -25,15 +48,25 @@ diff -up jing-trang-20181222/build.xml.fix jing-trang-20181222/build.xml
 -    <arg value="${doc.dir}"/>
 -  </exec>
 -</target>
--
--<target name="realclean" depends="clean"
+ 
+-<target name="realclean" depends="ant-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
+diff --git a/build.xsl b/build.xsl
+index 1703937..e45acf6 100644
+--- a/build.xsl
++++ b/build.xsl
+@@ -4,7 +4,7 @@
+ 
+ <xsl:output indent="yes"
+ 	    encoding="utf-8"/>
+-	    
++
+ <xsl:variable name="build" select="'${build.dir}'"/>
+ <xsl:variable name="doc" select="'${doc.dir}'"/>
+ <xsl:template match="/">
 @@ -23,12 +23,6 @@
      <target name="dummy"/>
      <target name="init">
@@ -70,19 +103,20 @@ diff -up jing-trang-20181222/build.xsl.fix jing-trang-20181222/build.xsl
  	</xsl:if>
        </classpath>
      </java>
-@@ -415,6 +409,9 @@
+@@ -397,6 +391,9 @@
  	<xsl:for-each select="../depends[@lib]">
  	  <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>
+     </java>
    </target>
-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
+diff --git a/datatype-sample/build.xml b/datatype-sample/build.xml
+index 1bc068a..5ec4dd8 100644
+--- a/datatype-sample/build.xml
++++ b/datatype-sample/build.xml
 @@ -2,6 +2,7 @@
  
  <property name="build.dir" value="build"/>
@@ -99,10 +133,11 @@ diff -up jing-trang-20181222/datatype-sample/build.xml.fix jing-trang-20181222/d
 +  <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
+ <target name="ant-jar" depends="compile">
+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
 @@ -3,5 +3,5 @@
    <test name="unit" type="testng"/>
    <depends module="util"/>
@@ -110,30 +145,33 @@ diff -up jing-trang-20181222/mod/catalog/mod.xml.fix jing-trang-20181222/mod/cat
 -  <depends lib="resolver"/>
 +  <depends lib="xml-commons-resolver"/>
  </module>
-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
+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
 @@ -1,4 +1,5 @@
  <module>
    <depends module="util"/>
 +  <depends lib="relaxngDatatype"/>
    <compile/>
  </module>
-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
+diff --git a/mod/jing/mod.xml b/mod/jing/mod.xml
+index 8d304f8..8b2ec82 100644
+--- a/mod/jing/mod.xml
++++ b/mod/jing/mod.xml
 @@ -21,8 +21,6 @@
    <jar>
      <manifest>
        <attribute name="Main-Class" value="com/thaiopensource/relaxng/util/Driver"/>
 -      <attribute name="Class-Path"
--		 value="xercesImpl.jar xml-apis.jar saxon.jar saxon9.jar xalan.jar isorelax.jar resolver.jar"/>
+-		 value="xercesImpl.jar xml-apis.jar saxon9.jar xalan.jar isorelax.jar resolver.jar"/>
      </manifest>
      <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine"/>
      <service type="org.relaxng.datatype.DatatypeLibraryFactory"/>
-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
+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
 @@ -3,6 +3,7 @@
    <depends module="resolver"/>
    <depends module="datatype"/>
@@ -142,9 +180,10 @@ diff -up jing-trang-20181222/mod/pattern/mod.xml.fix jing-trang-20181222/mod/pat
    <compile test="yes"/>
    <test name="unit" type="testng"/>
  </module>
-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
+diff --git a/mod/regex/mod.xml b/mod/regex/mod.xml
+index 1b10caa..f1bc0a4 100644
+--- a/mod/regex/mod.xml
++++ b/mod/regex/mod.xml
 @@ -1,6 +1,6 @@
  <module>
    <depends module="util"/>
@@ -153,19 +192,27 @@ diff -up jing-trang-20181222/mod/regex/mod.xml.fix jing-trang-20181222/mod/regex
    <compile test="yes"/>
    <test name="xerces" type="java"
  	class="com.thaiopensource.datatype.xsd.regex.test.TestDriver">
-@@ -46,7 +46,8 @@
+@@ -46,14 +46,14 @@
  	    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
+ 	</classpath>
+       </java>
+     </target>
+-    
++
+     <target name="mod.regex.check-gen" depends="mod.regex-gen.compile-main">
+       <uptodate property="mod.regex.gen-ok"
+ 		targetfile="${build.dir}/mod/regex/gensrc/main/com/thaiopensource/datatype/xsd/regex/java/Categories.java">
+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
 @@ -7,6 +7,7 @@
    <depends module="rng-parse"/>
    <depends module="pattern"/>
@@ -174,9 +221,10 @@ diff -up jing-trang-20181222/mod/rng-jaxp/mod.xml.fix jing-trang-20181222/mod/rn
    <compile test="yes"/>
    <test name="unit" type="testng"/>
  </module>
-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
+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
 @@ -7,7 +7,7 @@
    <depends module="pattern"/>
    <depends module="validate"/>
@@ -186,9 +234,10 @@ diff -up jing-trang-20181222/mod/rng-validate/mod.xml.fix jing-trang-20181222/mo
    <test name="spec" type="validate" schema="eg/testSuite.rng"/>
    <compile/>
    <version package="com/thaiopensource/relaxng/util"/>
-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
+diff --git a/mod/schematron/mod.xml b/mod/schematron/mod.xml
+index 1e370c7..773b375 100644
+--- a/mod/schematron/mod.xml
++++ b/mod/schematron/mod.xml
 @@ -3,7 +3,7 @@
    <depends module="resolver"/>
    <depends module="validate"/>
@@ -198,9 +247,10 @@ diff -up jing-trang-20181222/mod/schematron/mod.xml.fix jing-trang-20181222/mod/
    <depends lib="saxon"/>
    <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
+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
 @@ -13,13 +13,12 @@
    <depends module="convert-to-xsd"/>
    <depends module="convert-from-dtd"/>
@@ -216,9 +266,10 @@ diff -up jing-trang-20181222/mod/trang/mod.xml.fix jing-trang-20181222/mod/trang
      </manifest>
      <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine">
        <provider classname="com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl"/>
-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
+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
 @@ -1,7 +1,7 @@
  <module>
    <depends module="util"/>
@@ -228,9 +279,10 @@ diff -up jing-trang-20181222/mod/xerces/mod.xml.fix jing-trang-20181222/mod/xerc
    <compile/>
    <service type="com.thaiopensource.validate.SchemaReaderFactory">
      <provider classname="com.thaiopensource.validate.xerces.XsdSchemaReaderFactory"/>
-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
+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
 @@ -2,6 +2,7 @@
    <depends module="util"/>
    <depends module="datatype"/>
@@ -239,3 +291,6 @@ diff -up jing-trang-20181222/mod/xsd-datatype/mod.xml.fix jing-trang-20181222/mo
    <test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/>
    <test name="unit" type="testng"/>
    <compile test="yes"/>
+-- 
+2.35.3
+
diff --git a/0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch b/0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
deleted file mode 100644
index 9b9ba2b..0000000
--- a/0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From c8a7800f6424beb64f4487e8c450875846e0d16a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Mon, 9 Jun 2014 09:57:38 +0300
-Subject: [PATCH 2/2] Use Xalan instead of Saxon for the build (#655601)
-
----
- build.xml                         | 10 +++++-----
- build.xsl                         |  4 ++--
- mod/schematron/mod.xml            |  4 ++--
- mod/xsd-datatype/test/xsdtest.xml |  2 ++
- test/saxon.xsl                    | 14 +++++++-------
- 5 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index ee0f061..574c75f 100644
---- a/build.xml
-+++ b/build.xml
-@@ -40,7 +40,7 @@
- 
- <target name="modbuild" depends="modules,check-modbuild" unless="modbuild-ok">
-   <xslt style="build.xsl" in="modules.xml" out="modbuild.xml" force="true">
--    <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+    <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-   </xslt>
- </target>
- 
-@@ -74,7 +74,7 @@
- 	includes="${moddir}/*/${modfile}"
- 	filedirparameter="name"
- 	destdir=".">
--    <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+    <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-     <regexpmapper from="mod/([-a-zA-Z0-9_]*)/mod.xml"
- 		  to="mod/\1/\1.iml"
- 		  handledirsep="true"/>
-@@ -180,15 +180,15 @@
- <target name="jing-doc" depends="version">
-   <xslt basedir="doc" destdir="${build.dir}" includes="derivative.xml"
-         style="doc/derivative.xsl">
--    <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+    <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-   </xslt>
-   <xslt basedir="doc" destdir="${build.dir}" includes="design.xml"
-         style="doc/design.xsl">
--    <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+    <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-   </xslt>
-   <xslt basedir="doc" destdir="${build.dir}" includes="nrl.xml"
-         style="doc/nrl.xsl">
--    <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+    <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-   </xslt>
-   <copy todir="${build.dir}">
-     <fileset dir="doc" includes="*.html"/>
-diff --git a/build.xsl b/build.xsl
-index e084fca..b29694f 100644
---- a/build.xsl
-+++ b/build.xsl
-@@ -330,7 +330,7 @@
-       <xslt style="{$srctestdir}/{@transform}"
- 	    in="{$srctest}"
- 	    out="{$runtestdir}/{@name}test.xml">
--	<factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+	<factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-       </xslt>
-       <!-- XXX Could validate intermediate result against a schema -->
-     </xsl:if>
-@@ -346,7 +346,7 @@
- 	  </xsl:otherwise>
- 	</xsl:choose>
-       </xsl:attribute>
--      <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+      <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-       <param name="dir" expression="{$runtestdir}"/>
-     </xslt>
-   </target>
-diff --git a/mod/schematron/mod.xml b/mod/schematron/mod.xml
-index 3786625..3e1d5b9 100644
---- a/mod/schematron/mod.xml
-+++ b/mod/schematron/mod.xml
-@@ -23,12 +23,12 @@
-       <xslt style="mod/schematron/lib/xsltc-fixup.xsl"
- 	    in="mod/schematron/src/main/${mod.schematron.respackage}/schematron.xsl"
- 	    out="${mod.schematron.resdir}/schematron-xsltc.xsl">
--	      <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+	      <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-       </xslt>
-       <xslt style="mod/schematron/lib/xsltc-fixup.xsl"
-       in="mod/schematron/src/main/${mod.schematron.respackage}/iso-schematron.xsl"
-       out="${mod.schematron.resdir}/iso-schematron-xsltc.xsl">
--        <factory name="com.icl.saxon.TransformerFactoryImpl"/>
-+        <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
-       </xslt>
-     </target>
-   </ant>
-diff --git a/mod/xsd-datatype/test/xsdtest.xml b/mod/xsd-datatype/test/xsdtest.xml
-index 5bbba48..fc0221b 100644
---- a/mod/xsd-datatype/test/xsdtest.xml
-+++ b/mod/xsd-datatype/test/xsdtest.xml
-@@ -739,7 +739,9 @@ B EEF </value>
- <length value="0"></length>
- <length value="1">x</length>
- <length value="1"> x </length>
-+<!-- xalan creates invalid XML out of this: &#55298;&#56320;
- <length value="1">&#x10800;</length>
-+-->
- </datatype>
- <datatype name="language">
- <valid>en</valid>
-diff --git a/test/saxon.xsl b/test/saxon.xsl
-index 9a86877..1471783 100644
---- a/test/saxon.xsl
-+++ b/test/saxon.xsl
-@@ -1,8 +1,8 @@
- <?xml version="1.0"?>
--<xsl:stylesheet version="1.0"
-+<xsl:stylesheet version="1.1"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
--  xmlns:saxon="http://icl.com/saxon"
--  extension-element-prefixes="saxon">
-+  xmlns:xalan="http://xml.apache.org/xalan"
-+  extension-element-prefixes="xalan">
- 
- <xsl:output method="text"/>
- 
-@@ -10,21 +10,21 @@
-   <xsl:variable name="prepped">
-     <xsl:apply-templates select="*"/>
-   </xsl:variable>
--  <xsl:apply-templates select="saxon:node-set($prepped)/documents/*" mode="output"/>
-+  <xsl:apply-templates select="xalan:nodeset($prepped)/documents/*" mode="output"/>
- </xsl:template>
- 
- <xsl:template match="document" mode="output">
--  <saxon:output href="{@href}" method="{@method}">
-+  <xsl:document href="{@href}" method="{@method}">
-     <xsl:if test="@dtd">
-       <xsl:value-of select="@dtd" disable-output-escaping="yes"/>
-     </xsl:if>
-     <xsl:copy-of select="node()"/>
--  </saxon:output>
-+  </xsl:document>
- </xsl:template>
- 
- <xsl:template match="dir" mode="output">
-   <xsl:value-of select="substring(File:mkdir(File:new(@name)),0,0)" 
--                xmlns:File="java:java.io.File"/>
-+                xmlns:File="xalan://java.io.File"/>
- </xsl:template>
- 
- </xsl:stylesheet>
--- 
-1.9.3
-
diff --git a/V20181222.tar.gz b/V20181222.tar.gz
deleted file mode 100644
index b816baf..0000000
--- a/V20181222.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23b245faf41a8e15b054956406b0d43c0a2d5429b2195f0fa1bf429ba87a8959
-size 14847113
diff --git a/V20220510.tar.gz b/V20220510.tar.gz
new file mode 100644
index 0000000..1a2a7c6
--- /dev/null
+++ b/V20220510.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f5b1f76c2942eaf57a1aa9a78fe643215a510cb6c83e333bcd6823c825b185a
+size 14317698
diff --git a/jing-20181222.pom b/jing-20220510.pom
similarity index 98%
rename from jing-20181222.pom
rename to jing-20220510.pom
index d5a8199..fd046b0 100644
--- a/jing-20181222.pom
+++ b/jing-20220510.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.relaxng</groupId>
   <artifactId>jing</artifactId>
-  <version>20181222</version>
+  <version>20220510</version>
   <name>Jing</name>
   <description>Jing, a tool for validating documents against RelaxNG schemas.</description>
   <url>http://www.thaiopensource.com/relaxng/jing.html</url>
diff --git a/jing-trang.changes b/jing-trang.changes
index 8b98764..bfb4e30 100644
--- a/jing-trang.changes
+++ b/jing-trang.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul 25 17:12:32 UTC 2022 - Thomas Schraitle <thomas.schraitle@suse.com>
+
+- Update to 20220510
+- Removed patch:
+  * 0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
+    Use Saxon9 instead of Xalan
+- Recreated patch files
+
 -------------------------------------------------------------------
 Fri Jul  2 11:40:01 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jing-trang.spec b/jing-trang.spec
index 122232e..6a80bcf 100644
--- a/jing-trang.spec
+++ b/jing-trang.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jing-trang
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,9 @@
 
 
 %global relaxng_hash 1fc8c8d337c2c75b6b15b281f2c69e86110e475f
+#
 Name:           jing-trang
-Version:        20181222
+Version:        20220510
 Release:        0
 Summary:        Schema validation and conversion based on RELAX NG
 License:        BSD-3-Clause
@@ -31,7 +32,6 @@ Source3:        https://repo1.maven.org/maven2/org/relaxng/trang/%{version}/tran
 Source10:       dtdinst.1
 #
 Patch0:         0000-Various-build-fixes.patch
-Patch1:         0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
 Patch2:         no-tests.patch
 Patch3:         old-saxon.patch
 BuildRequires:  ant >= 1.8.2
@@ -126,7 +126,7 @@ mv gcj/{trang,jing}.1 .
 
 rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar")
 %patch0 -p1
-%patch1 -p1
+# %%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 rm -f \
diff --git a/no-tests.patch b/no-tests.patch
index b8190b2..76e3cbe 100644
--- a/no-tests.patch
+++ b/no-tests.patch
@@ -1,30 +1,53 @@
---- 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 @@
+From 1c6338f2640ed9e7a93f84986d3019a22450515a Mon Sep 17 00:00:00 2001
+From: Tom Schraitle <tom_schr@web.de>
+Date: Mon, 25 Jul 2022 19:08:57 +0200
+Subject: [PATCH] No tests
+
+---
+ build.xml                | 2 +-
+ build.xsl                | 6 +-----
+ mod/catalog/mod.xml      | 3 +--
+ mod/infer/mod.xml        | 3 +--
+ mod/pattern/mod.xml      | 3 +--
+ mod/rng-jaxp/mod.xml     | 3 +--
+ mod/util/mod.xml         | 3 +--
+ mod/xsd-datatype/mod.xml | 4 +---
+ 8 files changed, 8 insertions(+), 19 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 51c695f..b88d420 100644
+--- a/build.xml
++++ b/build.xml
+@@ -409,7 +409,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="ant-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 @@
+diff --git a/build.xsl b/build.xsl
+index e45acf6..334b1a6 100644
+--- a/build.xsl
++++ b/build.xsl
+@@ -15,11 +15,7 @@
      <property name="javacc.dir" value="${{lib.dir}}"/>
-     <property name="ant.build.javac.source" value="7"/>
-     <property name="ant.build.javac.target" value="1.7"/>
+     <property name="ant.build.javac.source" value="8"/>
+     <property name="ant.build.javac.target" value="1.8"/>
 -    <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
+diff --git a/mod/catalog/mod.xml b/mod/catalog/mod.xml
+index 5398646..ae21910 100644
+--- a/mod/catalog/mod.xml
++++ b/mod/catalog/mod.xml
 @@ -1,6 +1,5 @@
  <module>
 -  <compile test="yes"/>
@@ -33,8 +56,10 @@
    <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
+diff --git a/mod/infer/mod.xml b/mod/infer/mod.xml
+index 8a781e9..e997d69 100644
+--- a/mod/infer/mod.xml
++++ b/mod/infer/mod.xml
 @@ -4,6 +4,5 @@
    <depends module="datatype"/>
    <depends module="xsd-datatype"/>
@@ -43,8 +68,10 @@
 -  <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
+diff --git a/mod/pattern/mod.xml b/mod/pattern/mod.xml
+index 875f1cb..1f1f199 100644
+--- a/mod/pattern/mod.xml
++++ b/mod/pattern/mod.xml
 @@ -4,6 +4,5 @@
    <depends module="datatype"/>
    <depends module="rng-parse"/>
@@ -53,8 +80,10 @@
 -  <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
+diff --git a/mod/rng-jaxp/mod.xml b/mod/rng-jaxp/mod.xml
+index 48c5d8c..c387216 100644
+--- a/mod/rng-jaxp/mod.xml
++++ b/mod/rng-jaxp/mod.xml
 @@ -8,6 +8,5 @@
    <depends module="pattern"/>
    <depends module="jaxp"/>
@@ -63,8 +92,10 @@
 -  <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
+diff --git a/mod/util/mod.xml b/mod/util/mod.xml
+index d9e1853..5317816 100644
+--- a/mod/util/mod.xml
++++ b/mod/util/mod.xml
 @@ -1,5 +1,4 @@
  <module>
 -  <compile test="yes"/>
@@ -72,8 +103,10 @@
 +  <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
+diff --git a/mod/xsd-datatype/mod.xml b/mod/xsd-datatype/mod.xml
+index cc7645b..2d717b3 100644
+--- a/mod/xsd-datatype/mod.xml
++++ b/mod/xsd-datatype/mod.xml
 @@ -3,9 +3,7 @@
    <depends module="datatype"/>
    <depends module="regex"/>
@@ -85,3 +118,6 @@
    <service type="org.relaxng.datatype.DatatypeLibraryFactory">
      <provider classname="com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl"/>
    </service>
+-- 
+2.35.3
+
diff --git a/trang-20181222.pom b/trang-20220510.pom
similarity index 98%
rename from trang-20181222.pom
rename to trang-20220510.pom
index 72607b9..3571c6b 100644
--- a/trang-20181222.pom
+++ b/trang-20220510.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.relaxng</groupId>
   <artifactId>trang</artifactId>
-  <version>20181222</version>
+  <version>20220510</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>