From e3aea3bb16e9a2c4582ce86330e394a36f78ffa2 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 24 May 2023 14:28:43 +0200
Subject: [PATCH] Update to upstream version 59

---
 .gitignore                 |  2 ++
 apache-commons-parent.spec | 19 ++++++++++++++-----
 sources                    |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 493fde2..1e21484 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /commons-parent-51.tar.gz
 /commons-parent-52.tar.gz
 /commons-parent-53.tar.gz
+/commons-parent-58.tar.gz
+/commons-parent-59.tar.gz
diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec
index f330f0f..57f1dd8 100644
--- a/apache-commons-parent.spec
+++ b/apache-commons-parent.spec
@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           apache-commons-parent
-Version:        53
-Release:        4%{?dist}
+Version:        59
+Release:        1%{?dist}
 Summary:        Apache Commons Parent Pom
 License:        Apache-2.0
 URL:            https://commons.apache.org/commons-parent-pom.html
@@ -15,7 +15,6 @@ Source0:        https://github.com/apache/commons-parent/archive/rel/commons-par
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
-BuildRequires:  mvn(org.apache:apache:pom:)
 BuildRequires:  mvn(biz.aQute.bnd:biz.aQute.bndlib)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
@@ -38,6 +37,8 @@ The Project Object Model files for the apache-commons packages.
 # Plugin is not in fedora
 %pom_remove_plugin org.apache.commons:commons-build-plugin
 %pom_remove_plugin org.apache.maven.plugins:maven-scm-publish-plugin
+%pom_remove_plugin org.spdx:spdx-maven-plugin
+%pom_remove_plugin org.cyclonedx:cyclonedx-maven-plugin
 
 # Plugins useless in package builds
 %pom_remove_plugin :apache-rat-plugin
@@ -47,9 +48,14 @@ The Project Object Model files for the apache-commons packages.
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :versions-maven-plugin
 
+%pom_remove_dep org.junit:junit-bom
+
+# For now avoid moditect
+%pom_xpath_remove 'pom:profile[pom:id="moditect"]'
+
 # Remove profiles for plugins that are useless in package builds
-for profile in animal-sniffer japicmp jacoco cobertura clirr; do
-    %pom_xpath_remove "pom:profile[pom:id='$profile']"
+for profile in animal-sniffer japicmp jacoco cobertura; do
+    %pom_xpath_remove "pom:profile[pom:id='${profile}']"
 done
 
 %build
@@ -63,6 +69,9 @@ done
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Aug 11 2023 Marian Koncek <mkoncek@redhat.com> - 59-1
+- Update to upstream version 59
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 53-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index b3c9825..2b24523 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (commons-parent-53.tar.gz) = c0f2567111191c4623647c35b1b316aaa55de66096a83f07ec69cf823faf2faf6ade1619a45948179a72c917fba532f289f37509c5933b745c306b3223ffe0eb
+SHA512 (commons-parent-59.tar.gz) = 0dd40e0f5b7d0f8e9218045d9b2bfeb161529c954b0c6d19ae412584b46e00592c23c88fc6b088897b278cda8a21b5232db16f4be03f06b416c45ed16ac1768a