From 5e33fe2958c49c546525671710574ac4a75bf724 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 17 May 2019 18:29:38 +0200
Subject: [PATCH] update to version 33, obolete maven-shared and
 maven-plugins-pom

---
 .gitignore        |  4 ++++
 6b8b444.patch     | 27 +++++++++++++++++++++++++++
 maven-parent.spec | 39 ++++++++++++++++++++++++++++++++++-----
 sources           |  2 +-
 4 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 6b8b444.patch

diff --git a/.gitignore b/.gitignore
index 8e05cdd..4e8064b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
+/results_*
+/*.src.rpm
+
 /maven-parent-20-source-release.zip
 /maven-parent-23-source-release.zip
 /maven-parent-24-source-release.zip
 /maven-parent-25-source-release.zip
 /maven-parent-26-source-release.zip
 /maven-parent-27-source-release.zip
+/maven-parent-33-source-release.zip
diff --git a/6b8b444.patch b/6b8b444.patch
new file mode 100644
index 0000000..271d73e
--- /dev/null
+++ b/6b8b444.patch
@@ -0,0 +1,27 @@
+From 6b8b4446a11799cb38826881cdef5b13a7b8834e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
+Date: Sun, 3 Feb 2019 08:57:19 +0100
+Subject: [PATCH] [MPOM-217] remove plexus javadoc taglet configuration
+
+---
+ pom.xml | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 27321f9..1066805 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -1043,13 +1043,6 @@ under the License.
+             <quiet>true</quiet>
+             <detectLinks>true</detectLinks>
+             <locale>en</locale>
+-            <tagletArtifacts>
+-              <tagletArtifact combine.id="org.codehaus.plexus:plexus-javadoc">
+-                <groupId>org.codehaus.plexus</groupId>
+-                <artifactId>plexus-javadoc</artifactId>
+-                <version>1.0</version>
+-              </tagletArtifact>
+-            </tagletArtifacts>
+           </configuration>
+         </plugin>
+         <!-- 
diff --git a/maven-parent.spec b/maven-parent.spec
index 97a1e92..c07d71f 100644
--- a/maven-parent.spec
+++ b/maven-parent.spec
@@ -1,23 +1,48 @@
 Name:           maven-parent
-Version:        27
-Release:        7%{?dist}
+Version:        33
+Release:        1%{?dist}
 Summary:        Apache Maven parent POM
 License:        ASL 2.0
+
 URL:            http://maven.apache.org
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
+# Upstream removed plexus-javadoc after the 33 release
+# https://github.com/apache/maven-parent/commit/6b8b4446a11799cb38826881cdef5b13a7b8834e
+Patch0:         6b8b444.patch
+
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  apache-parent
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+BuildRequires:  mvn(org.apache:apache:pom:)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+
+# explicitly require maven-plugin-tools-javadoc
+Requires:       mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc)
+
+# this package obsoletes maven-shared and maven-plugins-pom
+Provides:       maven-shared = %{version}-%{release}
+Obsoletes:      maven-shared < 22-9
+
+Provides:       maven-plugins-pom = %{version}-%{release}
+Obsoletes:      maven-plugins-pom < 28-9
 
 %description
 Apache Maven parent POM file used by other Maven projects.
 
 %prep
 %setup -q
-%pom_remove_plugin :maven-enforcer-plugin
-%pom_remove_plugin :maven-checkstyle-plugin
+%patch0 -p1
+
 %pom_remove_plugin :apache-rat-plugin
+%pom_remove_plugin :maven-checkstyle-plugin
+%pom_remove_plugin -r :maven-enforcer-plugin
+%pom_remove_plugin :maven-scm-publish-plugin
+%pom_remove_plugin :maven-site-plugin
 
 %build
 %mvn_build
@@ -29,6 +54,10 @@ Apache Maven parent POM file used by other Maven projects.
 %doc LICENSE NOTICE
 
 %changelog
+* Fri May 17 2019 Fabio Valentini <decathorpe@gmail.com> - 33-1
+- Update to upstream version 33
+- Obsolete maven-shared and maven-plugins-pom.
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 27-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index a8dccb1..b6ac26f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc1549c64c6878d5917a770fa339893e  maven-parent-27-source-release.zip
+SHA512 (maven-parent-33-source-release.zip) = ebbcf83d2d8b3f9ff681669cef54559eed42c1453dfc913888de90f23d1a6f7de73b43030d94803e037c41d8efa908f99ab25fefec1e250b3c8704e0b44d9c6b