Accepting request 1108224 from Java:packages

2.7.3

OBS-URL: https://build.opensuse.org/request/show/1108224
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xalan-j2?expand=0&rev=31

openjdk-build.patch

@@ -1,6 +1,7 @@
---- xalan-j_2_7_2/build.xml	2014-03-26 16:21:31.000000000 +0100
+diff -urEbwB xalan-j_2_7_3.orig/build.xml xalan-j_2_7_3/build.xml
-+++ xalan-j_2_7_2/build.xml	2017-10-03 13:58:53.759678877 +0200
+--- xalan-j_2_7_3.orig/build.xml	2023-08-30 18:36:44.177771503 +0200
-@@ -216,14 +216,12 @@
++++ xalan-j_2_7_3/build.xml	2023-08-30 18:49:32.266249508 +0200
+@@ -221,14 +221,12 @@
      <pathelement location="${taglet.jar}" />
      <pathelement location="${build.serializer.jar}" />
      <pathelement location="${build.xalan.jar}" />
@@ -15,15 +16,15 @@
    </path>
    <path id="compile.class.path">
      <!-- Ensure the selected parser.jar file is used to compile against -->
-@@ -232,7 +230,6 @@
+@@ -237,7 +235,6 @@
      <pathelement location="${xmlapis.jar}" />
      <pathelement location="${build.serializer.jar}" />
      <pathelement location="${parser.jar}" />
 -    <pathelement path="${java.class.path}" />
    </path>
+ 	
    <path id="xslt.boot.class.path">
-     <!-- Put this version of xalan in front of the jdk's for JDK 1.4+ -->
+@@ -398,7 +395,6 @@
-@@ -392,7 +389,6 @@
        <exclude name="**/IncrementalSAXSource_Xerces.java" 
          unless="xerces.present"	 />
        <classpath refid="compile.class.path" />
@@ -31,7 +32,7 @@
      </javac>
      <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
      <copy todir="${build.classes}">
-@@ -408,6 +404,12 @@
+@@ -414,6 +410,12 @@
    <!-- =================================================================== -->
    <target name="xalan-interpretive.compile" depends="xml.compile"
      description="Compile the Xalan interpretive classes (skips XSLTC)" >
@@ -44,7 +45,7 @@
      <echo message="Compiling Xalan interpretive classes" />
      <javac srcdir="${src.dir}" 
             destdir="${build.classes}"
-@@ -418,7 +420,6 @@
+@@ -425,7 +427,6 @@
        <include name="${xalan.reldir}/**/*.java" />
        <exclude name="${xsltc.reldir}/**/*.java" />
        <classpath refid="compile.class.path" />
@@ -52,7 +53,7 @@
        <sourcepath refid="compile.source.path" />
      </javac>
      <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
-@@ -447,7 +448,6 @@
+@@ -454,7 +455,6 @@
      <!-- build.classes needed for 
           org.apache.xalan.xsltc.util.JavaCupRedirect -->
      <pathelement location="${build.classes}" />
@@ -60,146 +61,159 @@
    </path>
  
    <!-- Attempt to determine dependency info for generated sources -->
-@@ -461,7 +461,6 @@
+@@ -469,7 +469,6 @@
-            debug="${build.debug}"
+     	   target="${compiler.target}" source="${compiler.source}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="xsltc.class.path" />
 -      <bootclasspath refid="xslt.boot.class.path" />
      </javac>
      <!-- These tricky uptodate statements hopefully determine if we 
           actually need to generate the java_cup and jlex files 
-@@ -525,7 +524,6 @@
+@@ -534,7 +533,6 @@
-            debug="${build.debug}"
+     	   target="${compiler.target}" source="${compiler.source}"
-     	   target="${compiler.target}" source="${compiler.source}"> 
+     	   nowarn="${compiler.nowarn}"> 
        <classpath refid="xsltc.class.path" />
 -      <bootclasspath refid="xslt.boot.class.path" />
      </javac>
    </target>
  
-@@ -539,7 +537,6 @@
+@@ -549,7 +547,6 @@
-            debug="${build.debug}"
+     	   target="${compiler.target}" source="${compiler.source}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="xsltc.class.path" />
 -      <bootclasspath refid="xslt.boot.class.path" />
      </javac>
    </target>
  
-@@ -738,90 +735,90 @@
+@@ -748,104 +745,104 @@
      <!-- Since the samples are packageless, they must be compiled separately. -->   
      <javac srcdir="${samples.dir}/SimpleTransform" 
             destdir="${build.samples}"  excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-+           debug="${build.debug}" 
++           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/UseStylesheetPI"   
             destdir="${build.samples}"  excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/UseStylesheetParam" 
             destdir="${build.samples}"  excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/SAX2SAX"  
             destdir="${build.samples}"  excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/DOM2DOM"  
             destdir="${build.samples}"  excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/Pipe"  
             destdir="${build.samples}"  excludes="${exclude}"
--           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+           debug="${build.debug}">
++           debug="${build.debug}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/UseXMLFilters"  
             destdir="${build.samples}"  excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/Trace"   
             destdir="${build.samples}"  excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/ApplyXPath"  
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>
      <javac srcdir="${samples.dir}/ApplyXPathDOM"  
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>             
      <javac srcdir="${samples.dir}/trax"  
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/extensions"  
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>           
      <javac srcdir="${samples.dir}/Validate"  
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac> 
      <javac srcdir="${samples.dir}/TransformThread"  
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
      </javac>
      <javac srcdir="${samples.dir}/XPathAPI"  
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
-     </javac>               
+@@ -889,7 +886,6 @@
-@@ -864,7 +861,7 @@
       <javac srcdir="${samples.dir}/servlet"
              destdir="${build.servlet}/WEB-INF/classes"
              debug="${build.debug}"
 -            bootclasspathref="xslt.boot.class.path" 
-+           
+      	    target="${compiler.target}" source="${compiler.source}"
-      	    target="${compiler.target}" source="${compiler.source}">
+      	    nowarn="${compiler.nowarn}">
          <classpath refid="samples.class.path" />
-         <classpath location="${servlet-api.jar}" />
+@@ -930,14 +926,14 @@
-@@ -904,13 +901,13 @@
    <target name="xsltc.samples.nojardepends">
      <mkdir dir="${build.samples}"/>
      <javac srcdir="${samples.dir}/translets"
@@ -207,52 +221,53 @@
 +           classpath="${build.xalan.jar}" 
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-+           debug="${build.debug}"
++           debug="${build.debug}" 
-   	       target="${compiler.target}" source="${compiler.source}"/>
+   	       target="${compiler.target}" source="${compiler.source}"
+   	       nowarn="${compiler.nowarn}"/>
      <javac srcdir="${samples.dir}/CompiledJAXP"
             destdir="${build.samples}" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-   	       target="${compiler.target}" source="${compiler.source}"/>
+   	       target="${compiler.target}" source="${compiler.source}"
+   	       nowarn="${compiler.nowarn}"/>
    </target>
- 
+@@ -951,7 +947,7 @@
-@@ -923,7 +920,7 @@
      <mkdir dir="${build.samples}/CompiledApplet"/>
      <javac srcdir="${samples.dir}/CompiledApplet"
             destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}"/>
+     	   target="${compiler.target}" source="${compiler.source}"
+   	       nowarn="${compiler.nowarn}"/>
      <jar jarfile="${build.xsltc.applet.jar}"
-          basedir="${build.samples}/CompiledApplet"
+@@ -968,7 +964,7 @@
-@@ -939,7 +936,7 @@
      <mkdir dir="${build.samples}/CompiledBrazil"/>
      <javac srcdir="${samples.dir}/CompiledBrazil"
             destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
      	<classpath location="${brazil.jar}"/>
-   	</javac>
+@@ -989,7 +985,7 @@
-@@ -959,7 +956,7 @@
      <mkdir dir="${build.samples}/CompiledEJB"/>
      <javac srcdir="${samples.dir}/CompiledEJB"
             destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
      	<classpath location="${javaee-api.jar}"/>
-     </javac>
+@@ -1008,7 +1004,7 @@
-@@ -977,7 +974,7 @@
      <mkdir dir="${build.samples}/CompiledServlet"/>
      <javac srcdir="${samples.dir}/CompiledServlet"
             destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   target="${compiler.target}" source="${compiler.source}" 
-     	<classpath location="${servlet-api.jar}"/>
+     	   classpath="${build.xalan.jar}:${servlet-api.jar}"
-     </javac>
+     	   nowarn="${compiler.nowarn}">
-@@ -1554,7 +1551,7 @@
+@@ -1627,7 +1623,7 @@
      <!-- Use FOP to generate a pdf file (classpath may need updating! -sc 18-Apr-01)-->
      <java fork="yes" 
            classname="org.apache.fop.apps.CommandLine"
@@ -261,11 +276,13 @@
        <arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
      </java>
    </target>
-@@ -1690,7 +1687,6 @@
+@@ -1764,7 +1760,6 @@
-     	   target="${compiler.target}" source="${compiler.source}">
+     	   nowarn="${compiler.nowarn}">
        <include name="${serializer.reldir}/**/*.java" />
        <classpath refid="compile.class.path" />
 -      <bootclasspath refid="xslt.boot.class.path" />
      </javac>
      <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
      <copy todir="${serializer.build.classes}">
+Only in xalan-j_2_7_3: build.xml.orig
+Only in xalan-j_2_7_3: build.xml.rej

serializer-2.7.2.pom

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>4</version>
-  </parent>
-
-  <groupId>xalan</groupId>
-  <artifactId>serializer</artifactId>
-  <version>2.7.2</version>
-
-  <name>Xalan Java Serializer</name>
-  <description>
-    Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input
-    SAX events.
-  </description>
-  <url>http://xml.apache.org/xalan-j/</url>
-
-  <dependencies>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.04</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.9.1</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-</project>

serializer-2.7.3.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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>xalan</groupId>
+  <artifactId>serializer</artifactId>
+  <version>2.7.3</version>
+</project>

xalan-2.7.2.pom

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project 
-  xmlns="http://maven.apache.org/POM/4.0.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>4</version>
-  </parent>
-
-  <groupId>xalan</groupId>
-  <artifactId>xalan</artifactId>
-  <version>2.7.2</version>
-
-  <name>Xalan Java</name>
-  <description>
-    Xalan-Java is an XSLT processor for transforming XML documents into HTML,
-    text, or other XML document types. It implements XSL Transformations (XSLT)
-    Version 1.0 and XML Path Language (XPath) Version 1.0 and can be used from
-    the command line, in an applet or a servlet, or as a module in other program.
-  </description>
-  <url>http://xml.apache.org/xalan-j/</url>  
-
-  <dependencies>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>serializer</artifactId>
-      <version>2.7.2</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.9.1</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-</project>

xalan-2.7.3.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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>xalan</groupId>
+  <artifactId>xalan</artifactId>
+  <version>2.7.3</version>
+</project>

xalan-j2-MANIFEST.MF

@@ -2,48 +2,48 @@ Main-Class: org.apache.xalan.xslt.Process
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.apache.xalan
-Bundle-Version: 2.7.2
+Bundle-Version: 2.7.3
 Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.apache.regexp;version="2.7.2",
+Export-Package: org.apache.regexp;version="2.7.3",
- org.apache.xalan;version="2.7.2",
+ org.apache.xalan;version="2.7.3",
- org.apache.xalan.client;version="2.7.2",
+ org.apache.xalan.client;version="2.7.3",
- org.apache.xalan.extensions;version="2.7.2",
+ org.apache.xalan.extensions;version="2.7.3",
- org.apache.xalan.lib;version="2.7.2",
+ org.apache.xalan.lib;version="2.7.3",
- org.apache.xalan.lib.sql;version="2.7.2",
+ org.apache.xalan.lib.sql;version="2.7.3",
- org.apache.xalan.processor;version="2.7.2",
+ org.apache.xalan.processor;version="2.7.3",
- org.apache.xalan.res;version="2.7.2",
+ org.apache.xalan.res;version="2.7.3",
- org.apache.xalan.serialize;version="2.7.2",
+ org.apache.xalan.serialize;version="2.7.3",
- org.apache.xalan.templates;version="2.7.2",
+ org.apache.xalan.templates;version="2.7.3",
- org.apache.xalan.trace;version="2.7.2",
+ org.apache.xalan.trace;version="2.7.3",
- org.apache.xalan.transformer;version="2.7.2",
+ org.apache.xalan.transformer;version="2.7.3",
- org.apache.xalan.xslt;version="2.7.2",
+ org.apache.xalan.xslt;version="2.7.3",
- org.apache.xalan.xsltc;version="2.7.2",
+ org.apache.xalan.xsltc;version="2.7.3",
- org.apache.xalan.xsltc.cmdline;version="2.7.2",
+ org.apache.xalan.xsltc.cmdline;version="2.7.3",
- org.apache.xalan.xsltc.cmdline.getopt;version="2.7.2",
+ org.apache.xalan.xsltc.cmdline.getopt;version="2.7.3",
- org.apache.xalan.xsltc.compiler;version="2.7.2",
+ org.apache.xalan.xsltc.compiler;version="2.7.3",
- org.apache.xalan.xsltc.compiler.util;version="2.7.2",
+ org.apache.xalan.xsltc.compiler.util;version="2.7.3",
- org.apache.xalan.xsltc.dom;version="2.7.2",
+ org.apache.xalan.xsltc.dom;version="2.7.3",
- org.apache.xalan.xsltc.runtime;version="2.7.2",
+ org.apache.xalan.xsltc.runtime;version="2.7.3",
- org.apache.xalan.xsltc.runtime.output;version="2.7.2",
+ org.apache.xalan.xsltc.runtime.output;version="2.7.3",
- org.apache.xalan.xsltc.trax;version="2.7.2",
+ org.apache.xalan.xsltc.trax;version="2.7.3",
- org.apache.xalan.xsltc.util;version="2.7.2",
+ org.apache.xalan.xsltc.util;version="2.7.3",
- org.apache.xml.dtm;version="2.7.2",
+ org.apache.xml.dtm;version="2.7.3",
- org.apache.xml.dtm.ref;version="2.7.2",
+ org.apache.xml.dtm.ref;version="2.7.3",
- org.apache.xml.dtm.ref.dom2dtm;version="2.7.2",
+ org.apache.xml.dtm.ref.dom2dtm;version="2.7.3",
- org.apache.xml.dtm.ref.sax2dtm;version="2.7.2",
+ org.apache.xml.dtm.ref.sax2dtm;version="2.7.3",
- org.apache.xml.res;version="2.7.2",
+ org.apache.xml.res;version="2.7.3",
- org.apache.xml.utils;version="2.7.2",
+ org.apache.xml.utils;version="2.7.3",
- org.apache.xml.utils.res;version="2.7.2",
+ org.apache.xml.utils.res;version="2.7.3",
- org.apache.xpath;version="2.7.2",
+ org.apache.xpath;version="2.7.3",
- org.apache.xpath.axes;version="2.7.2",
+ org.apache.xpath.axes;version="2.7.3",
- org.apache.xpath.compiler;version="2.7.2",
+ org.apache.xpath.compiler;version="2.7.3",
- org.apache.xpath.domapi;version="2.7.2",
+ org.apache.xpath.domapi;version="2.7.3",
- org.apache.xpath.functions;version="2.7.2",
+ org.apache.xpath.functions;version="2.7.3",
- org.apache.xpath.jaxp;version="2.7.2",
+ org.apache.xpath.jaxp;version="2.7.3",
- org.apache.xpath.objects;version="2.7.2",
+ org.apache.xpath.objects;version="2.7.3",
- org.apache.xpath.operations;version="2.7.2",
+ org.apache.xpath.operations;version="2.7.3",
- org.apache.xpath.patterns;version="2.7.2",
+ org.apache.xpath.patterns;version="2.7.3",
- org.apache.xpath.res;version="2.7.2"
+ org.apache.xpath.res;version="2.7.3"
 Require-Bundle: system.bundle, org.apache.xerces
 Eclipse-BuddyPolicy: registered
 
@@ -53,20 +53,20 @@ Specification-Title: Java API for XML Processing
 Specification-Vendor: Sun Microsystems Inc.
 Specification-Version: 1.3
 Implementation-Title: org.apache.xalan
-Implementation-Version: 2.7.2
+Implementation-Version: 2.7.3
 Implementation-Vendor: Apache Software Foundation
 Implementation-URL: http://xml.apache.org/xalan-j/dist/
 
 Name: org/apache/xml/
 Comment: DTM implementation and utilities
 Implementation-Title: org.apache.xml
-Implementation-Version: 2.7.2
+Implementation-Version: 2.7.3
 Implementation-Vendor: Apache Software Foundation
 Implementation-URL: http://xml.apache.org/xalan-j/dist/
 
 Name: org/apache/xpath/
 Comment: XPath engine
 Implementation-Title: org.apache.xpath
-Implementation-Version: 2.7.2
+Implementation-Version: 2.7.3
 Implementation-Vendor: Apache Software Foundation
 Implementation-URL: http://xml.apache.org/xalan-j/dist/

xalan-j2-manifest.patch

@@ -1,6 +1,6 @@
-diff -urN xalan-j_2_7_2.old/src/MANIFEST.MF xalan-j_2_7_2/src/MANIFEST.MF
+diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.MF xalan-j_2_7_3/src/MANIFEST.MF
---- xalan-j_2_7_2.old/src/MANIFEST.MF	2014-06-23 09:21:30.815410307 +0200
+--- xalan-j_2_7_3.orig/src/MANIFEST.MF	2023-08-30 18:36:44.211105060 +0200
-+++ xalan-j_2_7_2/src/MANIFEST.MF	2014-06-23 09:42:52.044528782 +0200
++++ xalan-j_2_7_3/src/MANIFEST.MF	2023-08-30 18:39:12.542098631 +0200
 @@ -1,7 +1,6 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -11,7 +11,7 @@ diff -urN xalan-j_2_7_2.old/src/MANIFEST.MF xalan-j_2_7_2/src/MANIFEST.MF
  Name: org/apache/xalan/
 @@ -38,33 +37,3 @@
  Implementation-Vendor: Apache Software Foundation
- Implementation-URL: http://xml.apache.org/xalan-j/
+ Implementation-URL: https://xalan.apache.org/xalan-j/
  
 -Name: java_cup/runtime/ 
 -Comment: Runtime component of JCup 
@@ -24,14 +24,14 @@ diff -urN xalan-j_2_7_2.old/src/MANIFEST.MF xalan-j_2_7_2/src/MANIFEST.MF
 -Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ 
 -
 -Name: org/apache/bcel/
--Comment: Byte Code Engineering Library 
+-Comment: Apache Commons Byte Code Engineering Library
--Specification-Title: Byte Code Engineering Library 
+-Specification-Title: Apache Commons BCEL
--Specification-Vendor: Markus Dahm 
+-Specification-Vendor: Apache Software Foundation
--Specification-Version: 5.0 rc1 
+-Specification-Version: 6.7.0
 -Implementation-Title: org.apache.bcel
 -Implementation-Version: @impl.version@
 -Implementation-Vendor: Apache Software Foundation
--Implementation-URL: http://jakarta.apache.org/bcel
+-Implementation-URL: https://commons.apache.org/proper/commons-bcel
 -
 -Name: org/apache/regexp/
 -Comment: Java Regular Expression package 
@@ -43,9 +43,9 @@ diff -urN xalan-j_2_7_2.old/src/MANIFEST.MF xalan-j_2_7_2/src/MANIFEST.MF
 -Implementation-Vendor: Apache Software Foundation
 -Implementation-URL: http://jakarta.apache.org/regexp
 -
-diff -urN xalan-j_2_7_2.old/src/MANIFEST.SERIALIZER xalan-j_2_7_2/src/MANIFEST.SERIALIZER
+diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER xalan-j_2_7_3/src/MANIFEST.SERIALIZER
---- xalan-j_2_7_2.old/src/MANIFEST.SERIALIZER	2014-06-23 09:21:30.815410307 +0200
+--- xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER	2023-08-30 18:36:44.211105060 +0200
-+++ xalan-j_2_7_2/src/MANIFEST.SERIALIZER	2014-06-23 09:43:13.107530730 +0200
++++ xalan-j_2_7_3/src/MANIFEST.SERIALIZER	2023-08-30 18:38:46.375256700 +0200
 @@ -1,7 +1,6 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -54,9 +54,9 @@ diff -urN xalan-j_2_7_2.old/src/MANIFEST.SERIALIZER xalan-j_2_7_2/src/MANIFEST.S
  
  Name: org/apache/xml/serializer/
  Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events.
-diff -urN xalan-j_2_7_2.old/src/manifest.xalan-interpretive xalan-j_2_7_2/src/manifest.xalan-interpretive
+diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xalan-interpretive xalan-j_2_7_3/src/manifest.xalan-interpretive
---- xalan-j_2_7_2.old/src/manifest.xalan-interpretive	2014-06-23 09:21:30.838410309 +0200
+--- xalan-j_2_7_3.orig/src/manifest.xalan-interpretive	2023-08-30 18:36:44.211105060 +0200
-+++ xalan-j_2_7_2/src/manifest.xalan-interpretive	2014-06-23 09:43:28.403532145 +0200
++++ xalan-j_2_7_3/src/manifest.xalan-interpretive	2023-08-30 18:38:46.375256700 +0200
 @@ -1,7 +1,6 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -65,9 +65,9 @@ diff -urN xalan-j_2_7_2.old/src/manifest.xalan-interpretive xalan-j_2_7_2/src/ma
  
  Name: org/apache/xalan/
  Comment: Main Xalan engine implementing TrAX/JAXP
-diff -urN xalan-j_2_7_2.old/src/manifest.xsltc xalan-j_2_7_2/src/manifest.xsltc
+diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xsltc xalan-j_2_7_3/src/manifest.xsltc
---- xalan-j_2_7_2.old/src/manifest.xsltc	2014-06-23 09:21:30.816410307 +0200
+--- xalan-j_2_7_3.orig/src/manifest.xsltc	2023-08-30 18:36:44.211105060 +0200
-+++ xalan-j_2_7_2/src/manifest.xsltc	2014-06-23 09:43:46.395533808 +0200
++++ xalan-j_2_7_3/src/manifest.xsltc	2023-08-30 18:39:52.469032707 +0200
 @@ -1,6 +1,5 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -93,7 +93,7 @@ diff -urN xalan-j_2_7_2.old/src/manifest.xsltc xalan-j_2_7_2/src/manifest.xsltc
 -Comment: Byte Code Engineering Library 
 -Specification-Title: Byte Code Engineering Library 
 -Specification-Vendor: Markus Dahm 
--Specification-Version: 5.0 rc1 
+-Specification-Version: 6.6.0
 -Implementation-Title: org.apache.bcel
 -Implementation-Version: @impl.version@
 -Implementation-Vendor: Apache Software Foundation

xalan-j2-serializer-MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.apache.xml.serializer
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-Localization: plugin
-Bundle-Version: 2.7.2
+Bundle-Version: 2.7.3
 Bundle-Vendor: %Bundle-Vendor.0
 Export-Package: org.apache.xml.serializer,org.apache.xml.serializer.do
  m3

xalan-j2.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Thu Aug 31 08:42:41 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 2.7.3
+  * Java 8 requirement
+    + This XalanJ release, requires users to use Java minimum
+      version 8 for working with XalanJ.
+  * Fix for CVE-2022-34169 (bsc#1201684) An integer truncation issue
+    when processing malicious XSLT stylesheets
+    + This issue was fixed within XalanJ's XSLTC processor. This
+      XalanJ issue, when present causes following problems:
+      Malicious XSLT stylesheets may be written, which could result
+      in XalanJ invalid translet Java byte code to be produced by
+      XalanJ XSLTC processor. The XalanJ translet is a Java byte
+      code compiled representation, of an XSLT transformation.
+  * Upgrade to Apache Commons BCEL 6.7.0
+    + This XalanJ release, contains upgraded version of Apache
+      Commons BCEL library.
+  * Enhancements for, performing XalanJ build and running of XalanJ
+    tests from source distribution
+    + The XalanJ users, can now make XalanJ builds and perform
+      XalanJ tests from the XalanJ source distribution. The XalanJ
+      build scripts for the implementation and the tests, both for
+      the Windows and Linux platforms, were enhanced to support
+      building XalanJ with JDK 1.8.
+  * Upgrade to Xerces-J 2.12.2
+    + This XalanJ release, contains upgraded versions of
+      xercesImpl.jar and xml-apis.jar (Xerces-J 2.12.2).
+- Modified patches:
+  * openjdk-build.patch
+  * xalan-j2-manifest.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Fri Mar 18 16:35:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

xalan-j2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xalan-j2
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,17 @@
 #
 
 
-%define cvs_version 2_7_2
+%define cvs_version 2_7_3
 Name:           xalan-j2
-Version:        2.7.2
+Version:        2.7.3
 Release:        0
 Summary:        Java XSLT processor
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://xalan.apache.org/index.html
-Source0:        http://www.apache.org/dist/xalan/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz
+Source0:        https://www.apache.org/dist/xalan/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz
-Source1:        http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom
+Source1:        https://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom
-Source2:        http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom
+Source2:        https://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom
 Source3:        xsltc-%{version}.pom
 Source4:        xalan-j2-serializer-MANIFEST.MF
 Source5:        xalan-j2-MANIFEST.MF
@@ -43,8 +43,10 @@ BuildRequires:  java-cup-bootstrap
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  jlex
+BuildRequires:  regexp
 BuildRequires:  servletapi5
 BuildRequires:  xml-commons-apis-bootstrap
+#!BuildIgnore:  apache-commons-lang3
 #!BuildIgnore:  java-cup
 #!BuildIgnore:  xerces-j2
 #!BuildIgnore:  xml-commons
@@ -122,14 +124,11 @@ dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sour
 cp %{SOURCE1} xalan.pom
 cp %{SOURCE2} serializer.pom
 
-%pom_remove_parent xalan.pom
-%pom_remove_parent serializer.pom
-
 %build
 if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
 pushd lib
 ln -sf $(build-classpath java-cup-runtime) runtime.jar
-ln -sf $(build-classpath bcel) BCEL.jar
+ln -sf $(build-classpath bcel) bcel-6.7.0.jar
 ln -sf $(build-classpath regexp) regexp.jar
 ln -sf $(build-classpath xerces-j2) xercesImpl.jar
 ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
@@ -140,7 +139,7 @@ ln -sf $(build-classpath ant) ant.jar
 ln -sf $(build-classpath jlex) JLex.jar
 ln -sf $(build-classpath stylebook) stylebook-1.0-b3_xalan-2.jar
 popd
-ant \
+%{ant} \
   -Dservlet-api.jar=$(build-classpath servletapi5) \
   -Dcompiler.source=1.8 -Dcompiler.target=1.8 \
   -Djava.awt.headless=true \

xalan-j_2_7_2-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98
-size 8416261

xsltc-2.7.3.pom

@@ -2,12 +2,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>xalan</groupId>
   <artifactId>xsltc</artifactId>
-  <version>2.7.2</version>
+  <version>2.7.3</version>
   <dependencies>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.7.2</version>
+      <version>2.7.3</version>
     </dependency>
   </dependencies>
 </project>