From 8bd7edd6eff7ea9ba8ba8cd12feecf23f0dc4ea9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 20 Feb 2024 08:40:17 +0100 Subject: [PATCH] Switch Java compiler source/target to 1.8 Resolves: RHEL-52707 --- xmlunit.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index e771e96..d77e28d 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -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.compile.source=1.8 -Dmaven.compile.target=1.8 %install %mvn_install @@ -129,6 +129,10 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder. %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Mon Aug 05 2024 Mikolaj Izdebski - 2.9.0-9 +- Switch Java compiler source/target to 1.8 +- Resolves: RHEL-52707 + * Thu Aug 01 2024 Troy Dawson - 2.9.0-9 - Bump release for Aug 2024 java mass rebuild