From 223426fc4cd77fe53f9d97efbb0d546e15fdbff5 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Fri, 1 Mar 2024 13:43:10 +0100 Subject: [PATCH 1/5] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index c0c28aa..14cd5c8 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Fri Mar 01 2024 Jiri Vanek - 2.9.0-8 +- bump of release for for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 2.9.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9525ffd028acd816f7a3a1cc32a46e530e99b5de Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 20 Feb 2024 08:40:17 +0100 Subject: [PATCH 2/5] Update Java source/target to 1.8 --- xmlunit.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index 14cd5c8..aed620d 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -81,17 +81,17 @@ This package provides %{summary}. %prep %setup -q -n %{name}-%{version}-src -%patch1 -p1 -%patch2 -p1 +%patch 1 -p1 +%patch 2 -p1 -%patch3 -p1 +%patch 3 -p1 rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactory.java\ xmlunit-core/src/main/java/org/xmlunit/builder/JaxbBuilderFactoryLocator.java\ xmlunit-core/src/test/java/org/xmlunit/builder/javax_jaxb\ ; -%patch4 -p1 +%patch 4 -p1 # Port to hamcrest 2.1 %java_remove_annotations xmlunit-matchers -p org[.]hamcrest[.]Factory @@ -112,7 +112,7 @@ rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java} %build -%mvn_build -s +%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Mar 02 2024 Marian Koncek - 2.9.0-9 +- Update Java source/target to 1.8 + * Fri Mar 01 2024 Jiri Vanek - 2.9.0-8 - bump of release for for java-21-openjdk as system jdk From 6dda4401072478c0cca8a8f8b430093516aab859 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 21 Feb 2024 10:02:03 +0100 Subject: [PATCH 3/5] Fix Java version properties --- xmlunit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index aed620d..325de35 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -112,7 +112,7 @@ rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java} %build -%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8 %install %mvn_install From 71cabc030ce6fe06bddb5a75343a80d72506d322 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 13:57:12 +0100 Subject: [PATCH 4/5] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 325de35..12957fe 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Mar 02 2024 Jiri Vanek - 2.9.0-10 +- bump of release for for java-21-openjdk as system jdk + * Sat Mar 02 2024 Marian Koncek - 2.9.0-9 - Update Java source/target to 1.8 From 724e9ff95875afcace28c700e4eff2ce0740b36a Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 21:48:41 +0100 Subject: [PATCH 5/5] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xmlunit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlunit.spec b/xmlunit.spec index 12957fe..3b725cb 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -2,7 +2,7 @@ Name: xmlunit Version: 2.9.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Provides classes to do asserts on xml # The whole package is ASL 2.0 except for xmlunit-legacy which is BSD License: Apache-2.0 @@ -129,6 +129,9 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Sat Mar 02 2024 Jiri Vanek - 2.9.0-11 +- Rebuilt for java-21-openjdk as system jdk + * Sat Mar 02 2024 Jiri Vanek - 2.9.0-10 - bump of release for for java-21-openjdk as system jdk