From 84b2bf109acd1f46a1a719a804de135dc80b5f5923aaceb7315705d5f072e36c Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 17 Dec 2021 12:14:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/logback?expand=0&rev=11

---
 logback.changes |  9 +++++++++
 logback.spec    | 16 ++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/logback.changes b/logback.changes
index e9fe6a3..492c6e0 100644
--- a/logback.changes
+++ b/logback.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Dec 17 12:11:00 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Do not execute goals generateTestStubs and compileTests of
+  gmavenplus-plugin, since we are not compiling or runnig tests
+  during the rpm build. This also allows us to use a wider range
+  of gmavenplus-plugin versions, since those executions changed
+  names in 1.6.
+
 -------------------------------------------------------------------
 Thu Dec 16 16:21:39 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/logback.spec b/logback.spec
index 6f664cc..4b0f7a8 100644
--- a/logback.spec
+++ b/logback.spec
@@ -112,20 +112,8 @@ rm -r %{name}-*/src/test/java/*
 
 %pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id = 'javadocjar']"
 
-%if %{?pkg_vcmp:%pkg_vcmp gmavenplus-plugin < 1.6}%{!?pkg_vcmp:0}
-%pom_remove_plugin "org.codehaus.gmavenplus:gmavenplus-plugin" logback-classic
-%pom_add_plugin "org.codehaus.gmavenplus:gmavenplus-plugin:1.5" logback-classic "
-        <executions>
-          <execution>
-            <goals>
-              <goal>generateStubs</goal>
-              <goal>compile</goal>
-              <goal>testGenerateStubs</goal>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>"
-%endif
+%pom_xpath_remove "pom:executions/pom:execution/pom:goals/pom:goal[text() = 'generateTestStubs']" logback-classic
+%pom_xpath_remove "pom:executions/pom:execution/pom:goals/pom:goal[text() = 'compileTests']" logback-classic
 
 # disable for now
 %pom_disable_module logback-site