From 41e77c197585c24f2a06a76eabf929210ec35c36587e32903775649f2b1174a9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:10:55 +0000
Subject: [PATCH] Accepting request 1114355 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114355
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=35
---
 apache-commons-collections.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 2e8e0bb..259b16b 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -38,7 +38,7 @@ BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
@@ -96,8 +96,6 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
 %patch4 -p1
 %patch5 -p1
 
-%pom_remove_parent .
-
 %build
 echo "junit.jar=$(build-classpath junit)" >>build.properties
 ant \
@@ -115,7 +113,7 @@ ln -sf %{short_name}-testframework.jar %{buildroot}%{_javadir}/%{name}-testframe
 
 # poms
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644  pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 %add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
 %add_maven_depmap %{short_name}:%{short_name}-testframework:%{version} %{short_name}-testframework.jar -f "testframework" -a "org.apache.commons:%{short_name}-testframework"