Accepting request 941211 from Java:packages

Do not depend on gmavenplus-plugin's test stub generator

OBS-URL: https://build.opensuse.org/request/show/941211
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/logback?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2021-12-17 22:54:34 +00:00 committed by Git OBS Bridge
commit 8c3ad0b0bd
2 changed files with 11 additions and 14 deletions

View File

@ -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>

View File

@ -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