From 1ae4d74f2d0848fb867cbbbd211c94267185bf30b72b114aa535f7063eb117f4 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 16 Jul 2020 07:26:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=72

---
 javapackages-tools.changes | 13 ++++++++
 javapackages-tools.spec    |  2 ++
 useless-plugins.patch      | 65 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 useless-plugins.patch

diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index b87b482..143ee12 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jul 16 07:23:37 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 5.3.1
+- Modified patch:
+  * suse-use-libdir.patch
+    + rediff to changed context
+- Added patch:
+  * useless-plugins.patch
+    + upstream patch to skip plugins that are useless during rpm
+      build
+- Define _rpmmacrodir for distributions that don't have it
+
 -------------------------------------------------------------------
 Tue May  5 12:32:03 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index fb78286..9914392 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -42,6 +42,8 @@ Patch1:         python-optional.patch
 #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did
 #               Avoid generating unresolvable requires
 Patch2:         suse-no-epoch.patch
+#PATCH-FIX-UPSTREM: Avoid requiring maven plugins useless for rpm build
+Patch3:         useless-plugins.patch
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  perl
diff --git a/useless-plugins.patch b/useless-plugins.patch
new file mode 100644
index 0000000..c81af75
--- /dev/null
+++ b/useless-plugins.patch
@@ -0,0 +1,65 @@
+--- javapackages-5.3.1/configs/configuration.xml	2019-06-14 12:26:27.000000000 +0200
++++ javapackages-5.3.1/configs/configuration.xml	2020-07-16 09:18:03.085645130 +0200
+@@ -4,6 +4,62 @@
+     <metadataRepositories>
+       <repository>/usr/share/maven-metadata</repository>
+     </metadataRepositories>
++    <skippedPlugins>
++      <!-- Version of Java and bytecode level is always fixed in distro -->
++      <plugin>
++        <groupId>org.codehaus.mojo</groupId>
++        <artifactId>animal-sniffer-maven-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-enforcer-plugin</artifactId>
++      </plugin>
++      <!-- Static analysis and code style is upstream's business -->
++      <plugin>
++        <groupId>org.codehaus.moj</groupId>
++        <artifactId>findbugs-maven-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <groupId>com.github.spotbug</groupId>
++        <artifactId>spotbugs-maven-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-checkstyle-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-pmd-plugin</artifactId>
++      </plugin>
++      <!-- Code coverage is upstream's business -->
++      <plugin>
++        <groupId>org.jacoco</groupId>
++        <artifactId>jacoco-maven-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <groupId>org.eluder.coveralls</groupId>
++        <artifactId>coveralls-maven-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <groupId>org.codehaus.mojo</groupId>
++        <artifactId>cobertura-maven-plugin</artifactId>
++      </plugin>
++      <!-- Release auditing is upstream's business -->
++      <plugin>
++        <groupId>org.apache.rat</groupId>
++        <artifactId>apache-rat-plugin</artifactId>
++      </plugin>
++      <!-- Cannot code sign in downstream builds -->
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-gpg-plugin</artifactId>
++      </plugin>
++      <!-- Cannot push artifacts to Nexus server -->
++      <plugin>
++        <groupId>org.sonatype.plugins</groupId>
++        <artifactId>nexus-staging-maven-plugin</artifactId>
++      </plugin>
++    </skippedPlugins>
+   </resolverSettings>
+   <installerSettings>
+     <metadataDir>usr/share/maven-metadata</metadataDir>