diff --git a/packages/f/felix-utils/.files b/packages/f/felix-utils/.files index aa3cd7ef169..db75fcad816 100644 Binary files a/packages/f/felix-utils/.files and b/packages/f/felix-utils/.files differ diff --git a/packages/f/felix-utils/.rev b/packages/f/felix-utils/.rev index 05c5ab30e92..f69b58bf7da 100644 --- a/packages/f/felix-utils/.rev +++ b/packages/f/felix-utils/.rev @@ -25,4 +25,12 @@ 1.11.4 790524 + + b1f5a7a126d04952f5eb801823760667 + 1.11.4 + + anag+factory + source/target 8 == fix build with jdk 21 + 1120328 + diff --git a/packages/f/felix-utils/felix-utils-build.xml b/packages/f/felix-utils/felix-utils-build.xml index 555415c7f4a..aa845c3ac61 100644 --- a/packages/f/felix-utils/felix-utils-build.xml +++ b/packages/f/felix-utils/felix-utils-build.xml @@ -25,7 +25,8 @@ - + + @@ -65,6 +66,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" diff --git a/packages/f/felix-utils/felix-utils.changes b/packages/f/felix-utils/felix-utils.changes index 11f1542909b..f13c67cdcc3 100644 --- a/packages/f/felix-utils/felix-utils.changes +++ b/packages/f/felix-utils/felix-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 25 15:11:28 UTC 2023 - Fridrich Strba + +- Build with source and target levels 8 + ------------------------------------------------------------------- Tue Mar 31 06:19:36 UTC 2020 - Fridrich Strba diff --git a/packages/f/felix-utils/felix-utils.spec b/packages/f/felix-utils/felix-utils.spec index de95a1c94b7..a6942daed42 100644 --- a/packages/f/felix-utils/felix-utils.spec +++ b/packages/f/felix-utils/felix-utils.spec @@ -1,7 +1,7 @@ # # spec file for package felix-utils # -# Copyright (c) 2020 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 @@ -30,7 +30,8 @@ Source1: %{name}-build.xml Patch0: 0000-Port-to-osgi-cmpn.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local >= 6 BuildRequires: osgi-compendium BuildRequires: osgi-core BuildArch: noarch @@ -60,11 +61,6 @@ build-jar-repository -s lib osgi-core osgi-compendium build-jar-repository -s lib junit hamcrest/core mockito %endif -%pom_remove_plugin :apache-rat-plugin - -%pom_remove_parent . -%pom_xpath_inject "pom:project" "org.apache.felix" . - %build %{ant} \ %if %{without tests} @@ -78,7 +74,7 @@ install -dm 0755 %{buildroot}%{_javadir}/felix install -pm 0644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{bundle}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/felix -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom %add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}