diff --git a/openjdk-build.patch b/openjdk-build.patch
index ba6e5dd..d8ec465 100644
--- a/openjdk-build.patch
+++ b/openjdk-build.patch
@@ -1,6 +1,7 @@
---- xalan-j_2_7_2/build.xml 2014-03-26 16:21:31.000000000 +0100
-+++ xalan-j_2_7_2/build.xml 2017-10-03 13:58:53.759678877 +0200
-@@ -216,14 +216,12 @@
+diff -urEbwB xalan-j_2_7_3.orig/build.xml xalan-j_2_7_3/build.xml
+--- xalan-j_2_7_3.orig/build.xml 2023-08-30 18:36:44.177771503 +0200
++++ xalan-j_2_7_3/build.xml 2023-08-30 18:49:32.266249508 +0200
+@@ -221,14 +221,12 @@
@@ -15,15 +16,15 @@
-@@ -232,7 +230,6 @@
+@@ -237,7 +235,6 @@
-
+
-
-@@ -392,7 +389,6 @@
+@@ -398,7 +395,6 @@
@@ -31,7 +32,7 @@
-@@ -408,6 +404,12 @@
+@@ -414,6 +410,12 @@
@@ -44,7 +45,7 @@
@@ -52,7 +53,7 @@
-@@ -447,7 +448,6 @@
+@@ -454,7 +455,6 @@
@@ -60,146 +61,159 @@
-@@ -461,7 +461,6 @@
- debug="${build.debug}"
- target="${compiler.target}" source="${compiler.source}">
+@@ -469,7 +469,6 @@
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
-
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
-+ debug="${build.debug}">
+- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
++ debug="${build.debug}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
-
-@@ -864,7 +861,7 @@
+@@ -889,7 +886,6 @@
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
-
-@@ -904,13 +901,13 @@
+@@ -930,14 +926,14 @@
++ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}"/>
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}"/>
-
-@@ -923,7 +920,7 @@
+@@ -951,7 +947,7 @@
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}"/>
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
-
-@@ -959,7 +956,7 @@
+@@ -989,7 +985,7 @@
+ target="${compiler.target}" source="${compiler.source}"
+ nowarn="${compiler.nowarn}">
-
-@@ -977,7 +974,7 @@
+@@ -1008,7 +1004,7 @@
-
-
-@@ -1554,7 +1551,7 @@
+ target="${compiler.target}" source="${compiler.source}"
+ classpath="${build.xalan.jar}:${servlet-api.jar}"
+ nowarn="${compiler.nowarn}">
+@@ -1627,7 +1623,7 @@
-@@ -1690,7 +1687,6 @@
- target="${compiler.target}" source="${compiler.source}">
+@@ -1764,7 +1760,6 @@
+ nowarn="${compiler.nowarn}">
-
+Only in xalan-j_2_7_3: build.xml.orig
+Only in xalan-j_2_7_3: build.xml.rej
diff --git a/serializer-2.7.2.pom b/serializer-2.7.2.pom
deleted file mode 100644
index ad83ffd..0000000
--- a/serializer-2.7.2.pom
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache
- apache
- 4
-
-
- xalan
- serializer
- 2.7.2
-
- Xalan Java Serializer
-
- Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input
- SAX events.
-
- http://xml.apache.org/xalan-j/
-
-
-
- xml-apis
- xml-apis
- 1.3.04
-
-
- xerces
- xercesImpl
- 2.9.1
- true
-
-
-
-
diff --git a/serializer-2.7.3.pom b/serializer-2.7.3.pom
new file mode 100644
index 0000000..8d0a00b
--- /dev/null
+++ b/serializer-2.7.3.pom
@@ -0,0 +1,8 @@
+
+
+ 4.0.0
+ xalan
+ serializer
+ 2.7.3
+
diff --git a/xalan-2.7.2.pom b/xalan-2.7.2.pom
deleted file mode 100644
index fd58cd6..0000000
--- a/xalan-2.7.2.pom
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache
- apache
- 4
-
-
- xalan
- xalan
- 2.7.2
-
- Xalan Java
-
- 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.
-
- http://xml.apache.org/xalan-j/
-
-
-
- xalan
- serializer
- 2.7.2
-
-
- xerces
- xercesImpl
- 2.9.1
- true
-
-
-
-
\ No newline at end of file
diff --git a/xalan-2.7.3.pom b/xalan-2.7.3.pom
new file mode 100644
index 0000000..5a2cbc1
--- /dev/null
+++ b/xalan-2.7.3.pom
@@ -0,0 +1,8 @@
+
+
+ 4.0.0
+ xalan
+ xalan
+ 2.7.3
+
diff --git a/xalan-j2-MANIFEST.MF b/xalan-j2-MANIFEST.MF
index 46ce6aa..063c112 100644
--- a/xalan-j2-MANIFEST.MF
+++ b/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",
- org.apache.xalan;version="2.7.2",
- org.apache.xalan.client;version="2.7.2",
- org.apache.xalan.extensions;version="2.7.2",
- org.apache.xalan.lib;version="2.7.2",
- org.apache.xalan.lib.sql;version="2.7.2",
- org.apache.xalan.processor;version="2.7.2",
- org.apache.xalan.res;version="2.7.2",
- org.apache.xalan.serialize;version="2.7.2",
- org.apache.xalan.templates;version="2.7.2",
- org.apache.xalan.trace;version="2.7.2",
- org.apache.xalan.transformer;version="2.7.2",
- org.apache.xalan.xslt;version="2.7.2",
- org.apache.xalan.xsltc;version="2.7.2",
- org.apache.xalan.xsltc.cmdline;version="2.7.2",
- org.apache.xalan.xsltc.cmdline.getopt;version="2.7.2",
- org.apache.xalan.xsltc.compiler;version="2.7.2",
- org.apache.xalan.xsltc.compiler.util;version="2.7.2",
- org.apache.xalan.xsltc.dom;version="2.7.2",
- org.apache.xalan.xsltc.runtime;version="2.7.2",
- org.apache.xalan.xsltc.runtime.output;version="2.7.2",
- org.apache.xalan.xsltc.trax;version="2.7.2",
- org.apache.xalan.xsltc.util;version="2.7.2",
- org.apache.xml.dtm;version="2.7.2",
- org.apache.xml.dtm.ref;version="2.7.2",
- org.apache.xml.dtm.ref.dom2dtm;version="2.7.2",
- org.apache.xml.dtm.ref.sax2dtm;version="2.7.2",
- org.apache.xml.res;version="2.7.2",
- org.apache.xml.utils;version="2.7.2",
- org.apache.xml.utils.res;version="2.7.2",
- org.apache.xpath;version="2.7.2",
- org.apache.xpath.axes;version="2.7.2",
- org.apache.xpath.compiler;version="2.7.2",
- org.apache.xpath.domapi;version="2.7.2",
- org.apache.xpath.functions;version="2.7.2",
- org.apache.xpath.jaxp;version="2.7.2",
- org.apache.xpath.objects;version="2.7.2",
- org.apache.xpath.operations;version="2.7.2",
- org.apache.xpath.patterns;version="2.7.2",
- org.apache.xpath.res;version="2.7.2"
+Export-Package: org.apache.regexp;version="2.7.3",
+ org.apache.xalan;version="2.7.3",
+ org.apache.xalan.client;version="2.7.3",
+ org.apache.xalan.extensions;version="2.7.3",
+ org.apache.xalan.lib;version="2.7.3",
+ org.apache.xalan.lib.sql;version="2.7.3",
+ org.apache.xalan.processor;version="2.7.3",
+ org.apache.xalan.res;version="2.7.3",
+ org.apache.xalan.serialize;version="2.7.3",
+ org.apache.xalan.templates;version="2.7.3",
+ org.apache.xalan.trace;version="2.7.3",
+ org.apache.xalan.transformer;version="2.7.3",
+ org.apache.xalan.xslt;version="2.7.3",
+ org.apache.xalan.xsltc;version="2.7.3",
+ org.apache.xalan.xsltc.cmdline;version="2.7.3",
+ org.apache.xalan.xsltc.cmdline.getopt;version="2.7.3",
+ org.apache.xalan.xsltc.compiler;version="2.7.3",
+ org.apache.xalan.xsltc.compiler.util;version="2.7.3",
+ org.apache.xalan.xsltc.dom;version="2.7.3",
+ org.apache.xalan.xsltc.runtime;version="2.7.3",
+ org.apache.xalan.xsltc.runtime.output;version="2.7.3",
+ org.apache.xalan.xsltc.trax;version="2.7.3",
+ org.apache.xalan.xsltc.util;version="2.7.3",
+ org.apache.xml.dtm;version="2.7.3",
+ org.apache.xml.dtm.ref;version="2.7.3",
+ org.apache.xml.dtm.ref.dom2dtm;version="2.7.3",
+ org.apache.xml.dtm.ref.sax2dtm;version="2.7.3",
+ org.apache.xml.res;version="2.7.3",
+ org.apache.xml.utils;version="2.7.3",
+ org.apache.xml.utils.res;version="2.7.3",
+ org.apache.xpath;version="2.7.3",
+ org.apache.xpath.axes;version="2.7.3",
+ org.apache.xpath.compiler;version="2.7.3",
+ org.apache.xpath.domapi;version="2.7.3",
+ org.apache.xpath.functions;version="2.7.3",
+ org.apache.xpath.jaxp;version="2.7.3",
+ org.apache.xpath.objects;version="2.7.3",
+ org.apache.xpath.operations;version="2.7.3",
+ org.apache.xpath.patterns;version="2.7.3",
+ 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/
diff --git a/xalan-j2-manifest.patch b/xalan-j2-manifest.patch
index 5a2a25f..fe55e2c 100644
--- a/xalan-j2-manifest.patch
+++ b/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
---- xalan-j_2_7_2.old/src/MANIFEST.MF 2014-06-23 09:21:30.815410307 +0200
-+++ xalan-j_2_7_2/src/MANIFEST.MF 2014-06-23 09:42:52.044528782 +0200
+diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.MF xalan-j_2_7_3/src/MANIFEST.MF
+--- xalan-j_2_7_3.orig/src/MANIFEST.MF 2023-08-30 18:36:44.211105060 +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
--Specification-Title: Byte Code Engineering Library
--Specification-Vendor: Markus Dahm
--Specification-Version: 5.0 rc1
+-Comment: Apache Commons Byte Code Engineering Library
+-Specification-Title: Apache Commons BCEL
+-Specification-Vendor: Apache Software Foundation
+-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
---- xalan-j_2_7_2.old/src/MANIFEST.SERIALIZER 2014-06-23 09:21:30.815410307 +0200
-+++ xalan-j_2_7_2/src/MANIFEST.SERIALIZER 2014-06-23 09:43:13.107530730 +0200
+diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER xalan-j_2_7_3/src/MANIFEST.SERIALIZER
+--- xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER 2023-08-30 18:36:44.211105060 +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
---- xalan-j_2_7_2.old/src/manifest.xalan-interpretive 2014-06-23 09:21:30.838410309 +0200
-+++ xalan-j_2_7_2/src/manifest.xalan-interpretive 2014-06-23 09:43:28.403532145 +0200
+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_3.orig/src/manifest.xalan-interpretive 2023-08-30 18:36:44.211105060 +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
---- xalan-j_2_7_2.old/src/manifest.xsltc 2014-06-23 09:21:30.816410307 +0200
-+++ xalan-j_2_7_2/src/manifest.xsltc 2014-06-23 09:43:46.395533808 +0200
+diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xsltc xalan-j_2_7_3/src/manifest.xsltc
+--- xalan-j_2_7_3.orig/src/manifest.xsltc 2023-08-30 18:36:44.211105060 +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
diff --git a/xalan-j2-serializer-MANIFEST.MF b/xalan-j2-serializer-MANIFEST.MF
index 7f037ae..7794602 100644
--- a/xalan-j2-serializer-MANIFEST.MF
+++ b/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
diff --git a/xalan-j2.changes b/xalan-j2.changes
index 1a99814..73c24fa 100644
--- a/xalan-j2.changes
+++ b/xalan-j2.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Thu Aug 31 08:42:41 UTC 2023 - Fridrich Strba
+
+- 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
diff --git a/xalan-j2.spec b/xalan-j2.spec
index 2ad879d..bf710db 100644
--- a/xalan-j2.spec
+++ b/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
-Source1: http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom
-Source2: http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom
+Source0: https://www.apache.org/dist/xalan/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz
+Source1: https://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{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 \
diff --git a/xalan-j_2_7_2-src.tar.gz b/xalan-j_2_7_2-src.tar.gz
deleted file mode 100644
index de60e92..0000000
--- a/xalan-j_2_7_2-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98
-size 8416261
diff --git a/xalan-j_2_7_3-src.tar.gz b/xalan-j_2_7_3-src.tar.gz
new file mode 100644
index 0000000..18a7af3
--- /dev/null
+++ b/xalan-j_2_7_3-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:638453194b6eb68f07f8d6becb14ff849913d3e93991fb866994badb94556456
+size 13686458
diff --git a/xsltc-2.7.2.pom b/xsltc-2.7.3.pom
similarity index 81%
rename from xsltc-2.7.2.pom
rename to xsltc-2.7.3.pom
index 03d2149..ae25375 100644
--- a/xsltc-2.7.2.pom
+++ b/xsltc-2.7.3.pom
@@ -2,12 +2,12 @@
4.0.0
xalan
xsltc
- 2.7.2
+ 2.7.3
xalan
xalan
- 2.7.2
+ 2.7.3