Compare commits

...

No commits in common. "c8-stream-201902" and "c10s" have entirely different histories.

16 changed files with 216 additions and 200 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

18
.gitignore vendored
View File

@ -1 +1,17 @@
SOURCES/xalan-j2-2.7.2.tar.gz
/results_*
/*.src.rpm
/xalan-j2-notarget.patch
/xalan-j_2_7_0-src-RHsemiCLEAN.tar.gz
/xalan-j_2_7_1-src.tar.gz
/serializer-2.7.1.pom
/xalan-2.7.1.pom
/xsltc-2.7.1.pom
/xalan-j2-2.7.1.tar.gz
/xalan-j2-2.7.2.tar.gz
/xalan-2.7.2.pom
/serializer-2.7.2.pom
/xsltc-2.7.2.pom
/xalan-j2-2.7.3.tar.gz
/xalan-2.7.3.pom
/serializer-2.7.3.pom

View File

@ -1 +0,0 @@
678a79a205b08c900722406f030e95fb7fa7f1c8 SOURCES/xalan-j2-2.7.2.tar.gz

View File

@ -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>

View File

@ -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>

View File

@ -1,75 +0,0 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.8.2
Created-By: 1.7.0_b147-icedtea (Oracle Corporation)
Main-Class: org.apache.xalan.xslt.Process
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.apache.xalan
Bundle-Version: 2.7.1
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.apache.regexp;version="2.7.1",
org.apache.xalan;version="2.7.1",
org.apache.xalan.client;version="2.7.1",
org.apache.xalan.extensions;version="2.7.1",
org.apache.xalan.lib;version="2.7.1",
org.apache.xalan.lib.sql;version="2.7.1",
org.apache.xalan.processor;version="2.7.1",
org.apache.xalan.res;version="2.7.1",
org.apache.xalan.serialize;version="2.7.1",
org.apache.xalan.templates;version="2.7.1",
org.apache.xalan.trace;version="2.7.1",
org.apache.xalan.transformer;version="2.7.1",
org.apache.xalan.xslt;version="2.7.1",
org.apache.xalan.xsltc;version="2.7.1",
org.apache.xalan.xsltc.cmdline;version="2.7.1",
org.apache.xalan.xsltc.cmdline.getopt;version="2.7.1",
org.apache.xalan.xsltc.compiler;version="2.7.1",
org.apache.xalan.xsltc.compiler.util;version="2.7.1",
org.apache.xalan.xsltc.dom;version="2.7.1",
org.apache.xalan.xsltc.runtime;version="2.7.1",
org.apache.xalan.xsltc.runtime.output;version="2.7.1",
org.apache.xalan.xsltc.trax;version="2.7.1",
org.apache.xalan.xsltc.util;version="2.7.1",
org.apache.xml.dtm;version="2.7.1",
org.apache.xml.dtm.ref;version="2.7.1",
org.apache.xml.dtm.ref.dom2dtm;version="2.7.1",
org.apache.xml.dtm.ref.sax2dtm;version="2.7.1",
org.apache.xml.res;version="2.7.1",
org.apache.xml.utils;version="2.7.1",
org.apache.xml.utils.res;version="2.7.1",
org.apache.xpath;version="2.7.1",
org.apache.xpath.axes;version="2.7.1",
org.apache.xpath.compiler;version="2.7.1",
org.apache.xpath.domapi;version="2.7.1",
org.apache.xpath.functions;version="2.7.1",
org.apache.xpath.jaxp;version="2.7.1",
org.apache.xpath.objects;version="2.7.1",
org.apache.xpath.operations;version="2.7.1",
org.apache.xpath.patterns;version="2.7.1",
org.apache.xpath.res;version="2.7.1"
Require-Bundle: system.bundle, org.apache.xerces
Eclipse-BuddyPolicy: registered
Name: org/apache/xalan/
Comment: Main Xalan engine implementing TrAX/JAXP
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.1
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.1
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.1
Implementation-Vendor: Apache Software Foundation
Implementation-URL: http://xml.apache.org/xalan-j/dist/

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-10
decision_contexts:
- osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

View File

@ -5,7 +5,7 @@ name=xalan-j2
version="$(sed -n 's/Version:\s*//p' *.spec)"
# RETRIEVE
wget "http://apache.miloslavbrada.cz/xalan/xalan-j/source/xalan-j_${version//./_}-src.tar.gz" -O "${name}-${version}.orig.tar.gz"
wget "https://archive.apache.org/dist/xalan/xalan-j/source/xalan-j_${version//./_}-src.tar.gz" -O "${name}-${version}.orig.tar.gz"
rm -rf tarball-tmp
mkdir tarball-tmp
@ -15,7 +15,11 @@ tar xf "../${name}-${version}.orig.tar.gz"
# CLEAN TARBALL
find -name '*.jar' -delete
find -name '*.class' -delete
rm */src/*.tar.gz
rm -r */samples
rm -r */xalan-test
mv * ${name}-${version}
tar czf "../${name}-${version}.tar.gz" *
cd ..
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

7
plans/javapackages.fmf Normal file
View File

@ -0,0 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: c10s
execute:
how: tmt

3
sources Normal file
View File

@ -0,0 +1,3 @@
SHA512 (xalan-j2-2.7.3.tar.gz) = 48fcec89040236c8ab4cf3facf54e6c491a4d4851f6fe47369150f033ed6fcdab50fa228f36200e0de65c251a7e24a7f76f56fbb9f3e5d071d139a254710cc4d
SHA512 (xalan-2.7.3.pom) = 65f1bb02ad4d0ddc1da20a54e6937353e39a9f70f9860b74ffef6061f7c55980f31258ba7e4b2664a6546208e4d41a4bd2c8beed3739248d89424d4bce561434
SHA512 (serializer-2.7.3.pom) = ab19e0d5de56a0b6db4515f3169bef9aadd8c6522296da4bb64eb2b271b4293aa4b37bc2c34fd1df50c53fb431c469eaa3df7144f53f4b6eb9faf9f9bd9a43e1

75
xalan-j2-MANIFEST.MF Normal file
View File

@ -0,0 +1,75 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.8.2
Created-By: 1.7.0_b147-icedtea (Oracle Corporation)
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-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"
Require-Bundle: system.bundle, org.apache.xerces
Eclipse-BuddyPolicy: registered
Name: org/apache/xalan/
Comment: Main Xalan engine implementing TrAX/JAXP
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-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-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-Vendor: Apache Software Foundation
Implementation-URL: http://xml.apache.org/xalan-j/dist/

View File

@ -1,18 +1,16 @@
%global cvs_version %(echo %{version} | tr . _)
Name: xalan-j2
Version: 2.7.2
Release: 2%{?dist}
Version: 2.7.3
Release: 6%{?dist}
Summary: Java XSLT processor
# src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
License: ASL 2.0 and W3C
License: Apache-2.0 AND W3C
URL: http://xalan.apache.org/
# ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz
Source1: xalan-j2-serializer-MANIFEST.MF
Source2: http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom
Source3: http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom
Source2: https://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom
Source3: https://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom
Source4: xsltc-%{version}.pom
Source5: xalan-j2-MANIFEST.MF
# Remove bundled binaries which cannot be easily verified for licensing
@ -21,6 +19,7 @@ Source6: generate-tarball.sh
Patch0: xalan-j2-noxsltcdeps.patch
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
BuildRequires: javapackages-local
BuildRequires: ant
@ -45,7 +44,7 @@ in other program.
%package xsltc
Summary: XSLT compiler
License: ASL 2.0
License: Apache-2.0
Requires: java_cup
Requires: bcel
Requires: regexp
@ -57,20 +56,16 @@ lightweight and portable Java byte codes called translets.
%package manual
Summary: Manual for %{name}
License: ASL 2.0
License: Apache-2.0
%description manual
Documentation for %{name}.
%prep
%setup -q -n xalan-j_%{cvs_version}
%setup -q
%patch0 -p0
find . -name '*.jar' -delete
find . -name '*.class' -delete
sed -i '/<bootclasspath/d' build.xml
(cd ./src && tar xf xml-commons-external-*-src.tar.gz)
# Remove classpaths from manifests
sed -i '/class-path/I d' $(find -iname '*manifest*')
@ -85,25 +80,18 @@ sed -i 's/\r//' KEYS LICENSE.txt NOTICE.txt xdocs/style/resources/script.js \
%mvn_package :xsltc xsltc
%build
pushd lib
ln -sf $(build-classpath java_cup-runtime) runtime.jar
ln -sf $(build-classpath bcel) BCEL.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
popd
pushd tools
ln -sf $(build-classpath java_cup) java_cup.jar
ln -sf $(build-classpath ant) ant.jar
popd
export CLASSPATH=$(build-classpath glassfish-servlet-api)
ant \
-Dcompiler.source=1.6 \
-Dcompiler.target=1.6 \
%ant \
-Dcompiler.source=1.8 \
-Dcompiler.target=1.8 \
-Djava.awt.headless=true \
-Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \
xalan-interpretive.jar\
-Dxmlapis.jar=$(build-classpath xml-commons-apis) \
-Dparser.jar=$(build-classpath xerces-j2) \
-Dbcel.jar=$(build-classpath bcel) \
-Druntime.jar=$(build-classpath java_cup-runtime) \
-Dregexp.jar=$(build-classpath regexp) \
-Djava_cup.jar=$(build-classpath java_cup) \
xalan-interpretive.jar \
xsltc.unbundledjar \
docs
@ -118,17 +106,9 @@ jar ufm build/xalan-interpretive.jar %{SOURCE5}
%install
%mvn_install
%post
# update-alternatives will remove the symlink - preserve it
mv %{_javadir}/jaxp_transform_impl.jar{,.tmp} || :
# alternatives removed in f26
update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar &>/dev/null || :
# restore the symlink
mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || :
%files -f .mfiles
%license LICENSE.txt NOTICE.txt
%doc KEYS readme.html
%doc KEYS README
%files xsltc -f .mfiles-xsltc
%license LICENSE.txt NOTICE.txt
@ -138,15 +118,93 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || :
%doc build/docs/*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.7.3-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.3-5
- Rebuild for regexp update
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.7.3-4
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.7.3-3
- Bump release for June 2024 mass rebuild
* Fri Jun 07 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.3-2
- Remove proprietary data from source RPM
- Resolves: RHEL-40364
* Fri Feb 02 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.3-1
- Update to upstream version 2.7.3
- Remove alternatives post striplet
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.2-16
- Convert License tag to SPDX format
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.7.2-12
- Rebuilt for java-17-openjdk as system jdk
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.2-10
- Bump Java compiler source/target levels to 1.7
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.2-8
- Build with OpenJDK 11
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.7.2-5
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Mon Jun 29 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.2-4
- Peg to Java 8 due to build issues on Java 11
* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.2-3
- Allow building against Java 11
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.2-2
- Mass rebuild for javapackages-tools 201902
* Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.7.2-1
- Update to version 2.7.2.
* Wed Jul 31 2019 Marian Koncek <mkoncek@redhat.com> - 2.7.2-1
- Update to upstream version 2.7.2
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.1-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.1-39
- Mass rebuild for javapackages-tools 201901
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.1-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Aug 07 2018 Michael Simacek <msimacek@redhat.com> - 0:2.7.1-38
- Update license of subpackages

View File

@ -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>