From f962a84f8c996b1b71844053b23be1f0cd517171775434c1b716050f2c3dc35b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:31:21 +0000
Subject: [PATCH] Accepting request 1114377 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114377
OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-component-api?expand=0&rev=9
---
 plexus-component-api-build.xml |  2 +-
 plexus-component-api.changes   |  5 -----
 plexus-component-api.spec      | 11 +++--------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/plexus-component-api-build.xml b/plexus-component-api-build.xml
index 103c454..734d4cc 100644
--- a/plexus-component-api-build.xml
+++ b/plexus-component-api-build.xml
@@ -12,7 +12,7 @@
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.version" value="1.0-alpha-15"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.source" value="1.6"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
diff --git a/plexus-component-api.changes b/plexus-component-api.changes
index 9570a72..dc00ba9 100644
--- a/plexus-component-api.changes
+++ b/plexus-component-api.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sun Mar 20 15:41:06 UTC 2022 - Fridrich Strba <fstrba@suse.com>
-
-- Build with java source and target levels 8
-
 -------------------------------------------------------------------
 Wed Mar  6 17:10:12 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-component-api.spec b/plexus-component-api.spec
index 0960218..6fb5170 100644
--- a/plexus-component-api.spec
+++ b/plexus-component-api.spec
@@ -32,10 +32,9 @@ Source0:        %{name}-%{project_version}.tar.xz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.6
-BuildRequires:  javapackages-local
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  plexus-classworlds
-Requires:       mvn(org.codehaus.plexus:plexus-classworlds)
 BuildArch:      noarch
 
 %description
@@ -52,10 +51,6 @@ API documentation for %{name}.
 %setup -q -n %{name}-%{project_version}
 cp %{SOURCE1} build.xml
 
-%pom_remove_parent
-
-%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>"
-
 %build
 mkdir -p lib
 build-jar-repository -s lib plexus/classworlds
@@ -67,7 +62,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -pm 0644 target/%{name}-%{project_version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
 %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}