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

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114347
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=179
---
 ant-antlr.spec  | 7 ++-----
 ant-junit.spec  | 7 ++-----
 ant-junit5.spec | 7 ++-----
 ant.spec        | 7 ++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/ant-antlr.spec b/ant-antlr.spec
index 1546032..12db883 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -48,7 +48,7 @@ Patch6:         apache-ant-xml-apis.patch
 Patch7:         reproducible-propertyfile-task.patch
 BuildRequires:  antlr-bootstrap
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis-bootstrap
 #!BuildIgnore:  xml-commons-apis
@@ -521,10 +521,7 @@ do
   fi
 
   #install pom
-  if [ "$jarname" != ant-bootstrap ]; then
-    %pom_remove_parent src/etc/poms/${jarname}/pom.xml
-  fi
-  install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
+  %mvn_install_pom src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   if [ "$jarname" = ant-launcher ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
   elif [ "$jarname" = ant-jmf ]; then
diff --git a/ant-junit.spec b/ant-junit.spec
index 08fd0a4..9d91b99 100644
--- a/ant-junit.spec
+++ b/ant-junit.spec
@@ -48,7 +48,7 @@ Patch6:         apache-ant-xml-apis.patch
 Patch7:         reproducible-propertyfile-task.patch
 BuildRequires:  antlr-bootstrap
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis-bootstrap
 #!BuildIgnore:  xml-commons-apis
@@ -521,10 +521,7 @@ do
   fi
 
   #install pom
-  if [ "$jarname" != ant-bootstrap ]; then
-    %pom_remove_parent src/etc/poms/${jarname}/pom.xml
-  fi
-  install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
+  %mvn_install_pom src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   if [ "$jarname" = ant-launcher ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
   elif [ "$jarname" = ant-jmf ]; then
diff --git a/ant-junit5.spec b/ant-junit5.spec
index 618be54..6f472a5 100644
--- a/ant-junit5.spec
+++ b/ant-junit5.spec
@@ -48,7 +48,7 @@ Patch6:         apache-ant-xml-apis.patch
 Patch7:         reproducible-propertyfile-task.patch
 BuildRequires:  antlr-bootstrap
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis-bootstrap
 #!BuildIgnore:  xml-commons-apis
@@ -521,10 +521,7 @@ do
   fi
 
   #install pom
-  if [ "$jarname" != ant-bootstrap ]; then
-    %pom_remove_parent src/etc/poms/${jarname}/pom.xml
-  fi
-  install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
+  %mvn_install_pom src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   if [ "$jarname" = ant-launcher ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
   elif [ "$jarname" = ant-jmf ]; then
diff --git a/ant.spec b/ant.spec
index 481fd7b..4231e25 100644
--- a/ant.spec
+++ b/ant.spec
@@ -47,7 +47,7 @@ Patch6:         apache-ant-xml-apis.patch
 Patch7:         reproducible-propertyfile-task.patch
 BuildRequires:  antlr-bootstrap
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis-bootstrap
 #!BuildIgnore:  xml-commons-apis
@@ -520,10 +520,7 @@ do
   fi
 
   #install pom
-  if [ "$jarname" != ant-bootstrap ]; then
-    %pom_remove_parent src/etc/poms/${jarname}/pom.xml
-  fi
-  install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
+  %mvn_install_pom src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   if [ "$jarname" = ant-launcher ]; then
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
   elif [ "$jarname" = ant-jmf ]; then