From 71ac85987290fcccb06f54547b0472976a410048ae2fa7ad37957417f8328538 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 25 Oct 2023 15:11:35 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/felix-utils?expand=0&rev=9

---
 felix-utils-build.xml | 4 +++-
 felix-utils.changes   | 5 +++++
 felix-utils.spec      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/felix-utils-build.xml b/felix-utils-build.xml
index 97b8125..4c27254 100644
--- a/felix-utils-build.xml
+++ b/felix-utils-build.xml
@@ -25,7 +25,8 @@
   <property name="test.reports" value="${build.dir}/test-reports"/>
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
   
-  <property name="compiler.source" value="1.7"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <!-- ====================================================================== -->
@@ -65,6 +66,7 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
+           release="${compiler.release}" 
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
diff --git a/felix-utils.changes b/felix-utils.changes
index 399d40d..cb74f95 100644
--- a/felix-utils.changes
+++ b/felix-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 25 15:11:28 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
 -------------------------------------------------------------------
 Tue Mar 31 06:19:36 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/felix-utils.spec b/felix-utils.spec
index 7af2bad..46f0e6b 100644
--- a/felix-utils.spec
+++ b/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

From 31410aae741a0e50d31b7f8d5edd5692ff5339b536a1b59615bae5f5f7af2639 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 25 Oct 2023 15:14:02 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/felix-utils?expand=0&rev=10

---
 felix-utils.spec | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/felix-utils.spec b/felix-utils.spec
index 46f0e6b..279e813 100644
--- a/felix-utils.spec
+++ b/felix-utils.spec
@@ -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" "<groupId>org.apache.felix</groupId>" .
-
 %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}