From 408a9d50035e3bc4b07e242673868889d0ccbd8826c64b3694950e6e38aef040 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Nov 2019 10:29:24 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=18 --- fix-getPluginsAsMap.patch | 22 - maven-plugin-plugin-bootstrap-resouces.patch | 601 +++++++------------ maven-plugin-plugin-bootstrap.changes | 13 + maven-plugin-plugin-bootstrap.spec | 46 +- maven-plugin-plugin.changes | 9 + maven-plugin-plugin.spec | 43 +- maven-plugin-tools-3.5.1-source-release.zip | 3 - maven-plugin-tools-3.6.0-source-release.zip | 3 + maven-plugin-tools-build.tar.xz | 4 +- maven-plugin-tools.changes | 13 + maven-plugin-tools.spec | 69 +-- 11 files changed, 275 insertions(+), 551 deletions(-) delete mode 100644 fix-getPluginsAsMap.patch delete mode 100644 maven-plugin-tools-3.5.1-source-release.zip create mode 100644 maven-plugin-tools-3.6.0-source-release.zip diff --git a/fix-getPluginsAsMap.patch b/fix-getPluginsAsMap.patch deleted file mode 100644 index 33d318e..0000000 --- a/fix-getPluginsAsMap.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java 2018-11-08 19:20:01.544523214 +0100 -+++ maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java 2018-11-08 19:30:02.187309471 +0100 -@@ -765,7 +765,6 @@ - return jdk; - } - -- @SuppressWarnings( "unchecked" ) - Plugin compiler = getCompilerPlugin( project.getBuild().getPluginsAsMap() ); - if ( compiler == null ) - { -@@ -797,9 +796,9 @@ - return "Unknown"; - } - -- private static Plugin getCompilerPlugin( Map pluginsAsMap ) -+ private static Plugin getCompilerPlugin( Map pluginsAsMap ) - { -- return (Plugin) pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" ); -+ return pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" ); - } - - private static String getPluginParameter( Plugin plugin, String parameter ) diff --git a/maven-plugin-plugin-bootstrap-resouces.patch b/maven-plugin-plugin-bootstrap-resouces.patch index 23c7008..d7ce652 100644 --- a/maven-plugin-plugin-bootstrap-resouces.patch +++ b/maven-plugin-plugin-bootstrap-resouces.patch @@ -1,6 +1,6 @@ ---- maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 -+++ maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 2019-04-01 15:29:09.389311211 +0200 -@@ -0,0 +1,419 @@ +--- maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 ++++ maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 2019-11-25 11:03:12.945643770 +0100 +@@ -0,0 +1,385 @@ + + + ${project.name} @@ -59,7 +59,9 @@ + + descriptor + Generate a plugin descriptor. -+Note: Since 3.0, for Java 5 plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++ ++Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++ + runtime + false + true @@ -111,7 +113,9 @@ + false + true + Generate a plugin descriptor. -+Note: Since 3.0, for Java 5 plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++ ++Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++ + + + packagingTypes @@ -136,7 +140,9 @@ + false + true + Generate a plugin descriptor. -+Note: Since 3.0, for Java 5 plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++ ++Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the 'compilation' of any scripts. This doesn't override the default binding coded at generate-resources phase in Maven core. ++ + + + skipErrorNoDescriptorsFound @@ -378,52 +384,11 @@ + ${maven.plugin.report.skip} + + -+ -+ updateRegistry -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ false -+ true -+ false -+ false -+ false -+ true -+ install -+ org.apache.maven.plugin.plugin.UpdatePluginRegistryMojo -+ java -+ per-lookup -+ once-per-session -+ 2.0 -+ plugin registry has been removed from Maven 3, this goal will be removed in next release -+ true -+ -+ -+ skip -+ boolean -+ 2.8 -+ false -+ true -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ skipUpdatePluginRegistry -+ boolean -+ 2.8 -+ false -+ true -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ -+ ${maven.plugin.skip} -+ ${maven.plugin.update.registry.skip} -+ -+ + + -\ No newline at end of file ---- maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 -+++ maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 15:29:09.389311211 +0200 -@@ -0,0 +1,1185 @@ +--- maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 ++++ maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-11-25 11:05:03.978261704 +0100 +@@ -0,0 +1,1062 @@ + + + ${project.name} @@ -514,13 +479,16 @@ + + + descriptor -+ Generate a plugin descriptor. -+<br/> -+<b>Note:</b> Since 3.0, for Java 5 plugin annotations support, ++ <p> ++Generate a plugin descriptor. ++</p> ++<p> ++<b>Note:</b> Since 3.0, for Java plugin annotations support, +default <a href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">phase</a> +defined by this goal is after the "compilation" of any scripts. This doesn't override +<a href="/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging">the default binding coded -+at generate-resources phase</a> in Maven core. ++at generate-resources phase</a> in Maven core. ++</p> + runtime + false + true @@ -587,13 +555,16 @@ + java.io.File + false + true -+ Generate a plugin descriptor. -+<br/> -+<b>Note:</b> Since 3.0, for Java 5 plugin annotations support, ++ <p> ++Generate a plugin descriptor. ++</p> ++<p> ++<b>Note:</b> Since 3.0, for Java plugin annotations support, +default <a href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">phase</a> +defined by this goal is after the "compilation" of any scripts. This doesn't override +<a href="/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging">the default binding coded -+at generate-resources phase</a> in Maven core. ++at generate-resources phase</a> in Maven core. ++</p> + + + packagingTypes @@ -632,13 +603,16 @@ + 2.6 + false + true -+ Generate a plugin descriptor. -+<br/> -+<b>Note:</b> Since 3.0, for Java 5 plugin annotations support, ++ <p> ++Generate a plugin descriptor. ++</p> ++<p> ++<b>Note:</b> Since 3.0, for Java plugin annotations support, +default <a href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">phase</a> +defined by this goal is after the "compilation" of any scripts. This doesn't override +<a href="/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging">the default binding coded -+at generate-resources phase</a> in Maven core. ++at generate-resources phase</a> in Maven core. ++</p> + + + skipErrorNoDescriptorsFound @@ -1023,97 +997,37 @@ + + + -+ -+ updateRegistry -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ false -+ true -+ false -+ false -+ false -+ true -+ install -+ org.apache.maven.plugin.plugin.UpdatePluginRegistryMojo -+ java -+ per-lookup -+ once-per-session -+ 2.0 -+ plugin registry has been removed from Maven 3, this goal will be removed in next release -+ true -+ -+ -+ artifactId -+ java.lang.String -+ true -+ false -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ groupId -+ java.lang.String -+ true -+ false -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ skip -+ boolean -+ 2.8 -+ false -+ true -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ skipUpdatePluginRegistry -+ boolean -+ 2.8 -+ false -+ true -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ usePluginRegistry -+ boolean -+ true -+ false -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ version -+ java.lang.String -+ true -+ false -+ Update the user plugin registry (if it's in use) to reflect the version we're installing. -+ -+ -+ -+ -+ -+ ${maven.plugin.skip} -+ ${maven.plugin.update.registry.skip} -+ -+ -+ -+ -+ -+ org.apache.maven.plugin.registry.MavenPluginRegistryBuilder -+ pluginRegistryBuilder -+ -+ -+ + + + -+ org.apache.maven.plugin-tools -+ maven-plugin-tools-api ++ org.apache.maven ++ maven-compat + jar -+ 3.5.1 ++ 3.0 + + + org.apache.maven -+ maven-core ++ maven-settings + jar -+ 2.2.1 ++ 3.6.2 ++ ++ ++ org.apache.maven ++ maven-model-builder ++ jar ++ 3.6.2 ++ ++ ++ org.apache.maven ++ maven-builder-support ++ jar ++ 3.6.2 ++ ++ ++ javax.inject ++ javax.inject ++ jar ++ 1 + + + org.eclipse.sisu @@ -1140,16 +1054,46 @@ + any + + -+ com.google.guava -+ guava ++ org.codehaus.plexus ++ plexus-interpolation + jar -+ 20.0 ++ 1.25 ++ ++ ++ org.apache.maven.wagon ++ wagon-provider-api ++ jar ++ 3.3.3 ++ ++ ++ org.apache.maven ++ maven-resolver-provider ++ jar ++ 3.6.2 ++ ++ ++ org.apache.maven.resolver ++ maven-resolver-spi ++ jar ++ 1.4.1 ++ ++ ++ org.slf4j ++ slf4j-api ++ jar ++ 1.7.25 ++ ++ ++ org.apache.maven ++ maven-core ++ jar ++ 3.0 + + + com.google.inject + guice + jar -+ 4.2.0 ++ 4.2.1 + + + aopalliance @@ -1158,52 +1102,70 @@ + 1.0 + + -+ javax.inject -+ javax.inject ++ cglib ++ cglib + jar -+ 1 ++ 3.2.0 + + + org.apache.maven.resolver -+ maven-resolver-spi ++ maven-resolver-api + jar -+ 1.1.1 ++ 1.4.1 ++ ++ ++ org.apache.maven.resolver ++ maven-resolver-util ++ jar ++ 1.4.1 ++ ++ ++ org.apache.maven.resolver ++ maven-resolver-impl ++ jar ++ 1.4.1 ++ ++ ++ org.codehaus.plexus ++ plexus-component-annotations ++ jar ++ 1.5.5 + + + org.apache.maven -+ maven-builder-support ++ maven-settings-builder + jar -+ 3.5.4 ++ 3.6.2 ++ ++ ++ org.sonatype.plexus ++ plexus-sec-dispatcher ++ jar ++ 1.4 ++ ++ ++ org.sonatype.plexus ++ plexus-cipher ++ jar ++ 1.4 ++ ++ ++ org.eclipse.sisu ++ org.eclipse.sisu.plexus ++ jar ++ 0.3.3 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-api ++ jar ++ 3.6.0 + + + org.apache.maven.plugin-tools + maven-plugin-tools-generators + jar -+ 3.5.1 -+ -+ -+ org.ow2.asm -+ asm -+ jar -+ 5.0.2 -+ -+ -+ org.ow2.asm -+ asm-commons -+ jar -+ 5.0.2 -+ -+ -+ org.ow2.asm -+ asm-tree -+ jar -+ 6.2.1 -+ -+ -+ org.ow2.asm -+ asm-analysis -+ jar -+ 6.2.1 ++ 3.6.0 + + + net.sf.jtidy @@ -1218,16 +1180,34 @@ + 1.0 + + ++ org.ow2.asm ++ asm-commons ++ jar ++ 7.0 ++ ++ ++ org.ow2.asm ++ asm-tree ++ jar ++ 7.2 ++ ++ ++ org.ow2.asm ++ asm-analysis ++ jar ++ 7.2 ++ ++ ++ org.ow2.asm ++ asm ++ jar ++ 7.0 ++ ++ + org.apache.maven.plugin-tools + maven-plugin-tools-java + jar -+ 3.5.1 -+ -+ -+ org.codehaus.plexus -+ plexus-component-annotations -+ jar -+ 1.5.5 ++ 3.6.0 + + + com.thoughtworks.qdox @@ -1239,25 +1219,25 @@ + org.apache.maven.plugin-tools + maven-plugin-tools-annotations + jar -+ 3.5.1 ++ 3.6.0 + + + org.codehaus.plexus + plexus-archiver + jar -+ 2.1.1 ++ 3.6.0 + + + org.codehaus.plexus + plexus-io + jar -+ 3.0.1 ++ 3.2.0 + + + org.apache.commons + commons-compress + jar -+ 1.16.1 ++ 1.19 + + + org.tukaani @@ -1266,28 +1246,10 @@ + 1.8 + + -+ org.easymock -+ easymock -+ jar -+ SYSTEM -+ -+ -+ org.objenesis -+ objenesis -+ jar -+ 2.6 -+ -+ -+ cglib -+ cglib -+ jar -+ 3.2.6 -+ -+ + org.apache.maven.plugin-tools + maven-plugin-annotations + jar -+ 3.5.1 ++ 3.6.0 + + + org.apache.maven.doxia @@ -1309,15 +1271,27 @@ + + + org.apache.maven.doxia ++ doxia-decoration-model ++ jar ++ 1.7.5 ++ ++ ++ commons-collections ++ commons-collections ++ jar ++ 3.2.1 ++ ++ ++ org.apache.maven.doxia + doxia-core + jar + 1.7 + + -+ xmlunit -+ xmlunit ++ org.apache.httpcomponents ++ httpcore + jar -+ 1.5 ++ 4.0.1 + + + org.apache.httpcomponents @@ -1329,31 +1303,19 @@ + commons-logging + commons-logging + jar -+ SYSTEM ++ any + + + commons-codec + commons-codec + jar -+ SYSTEM ++ any + + -+ org.apache.httpcomponents -+ httpcore ++ xmlunit ++ xmlunit + jar -+ 4.0.1 -+ -+ -+ org.apache.maven.doxia -+ doxia-decoration-model -+ jar -+ 1.7.5 -+ -+ -+ org.apache.maven.doxia -+ doxia-skin-model -+ jar -+ 1.7.5 ++ 1.5 + + + org.apache.maven.doxia @@ -1368,52 +1330,46 @@ + 1.0-beta-7 + + -+ commons-collections -+ commons-collections -+ jar -+ 3.2.1 -+ -+ + org.apache.commons + commons-lang3 + jar + 3.5 + + ++ org.apache.maven.doxia ++ doxia-skin-model ++ jar ++ 1.7.5 ++ ++ + org.apache.maven + maven-plugin-api + jar -+ 2.2.1 ++ 3.0 + + + org.codehaus.plexus + plexus-classworlds + jar -+ 2.5.2 -+ -+ -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus -+ jar -+ 0.3.3 ++ 2.6.0 + + + org.apache.maven + maven-model + jar -+ 2.2.1 ++ 3.0 + + + org.apache.maven + maven-repository-metadata + jar -+ 2.2.1 ++ 3.0 + + + org.apache.maven + maven-artifact + jar -+ 2.2.1 ++ 3.0 + + + org.apache.maven.reporting @@ -1428,6 +1384,12 @@ + 3.2.0 + + ++ commons-io ++ commons-io ++ jar ++ 2.5 ++ ++ + org.apache.maven.reporting + maven-reporting-api + jar @@ -1455,51 +1417,27 @@ + org.apache.xbean + xbean-reflect + jar -+ 3.7 ++ SYSTEM + + -+ org.apache.maven.surefire -+ maven-surefire-common ++ com.google.guava ++ guava + jar -+ 2.19.1 ++ 20.0 + + -+ org.apache.maven.surefire -+ surefire-api ++ junit ++ junit + jar -+ 2.22.0 ++ SYSTEM + + -+ org.apache.maven.surefire -+ surefire-logger-api -+ jar -+ 2.22.0 -+ -+ -+ org.apache.maven.surefire -+ surefire-booter -+ jar -+ 2.22.0 -+ -+ -+ commons-io -+ commons-io -+ jar -+ 2.5 -+ -+ -+ org.apache.maven.shared -+ maven-common-artifact-filters ++ org.hamcrest ++ hamcrest-core + jar + 1.3 + + -+ org.codehaus.plexus -+ plexus-java -+ jar -+ 0.9.8 -+ -+ + org.apache.velocity + velocity + jar @@ -1511,107 +1449,10 @@ + jar + 2.4 + -+ -+ org.apache.maven -+ maven-plugin-registry -+ jar -+ any -+ -+ -+ org.apache.maven -+ maven-compat -+ jar -+ any -+ -+ -+ org.apache.maven -+ maven-settings -+ jar -+ 3.5.4 -+ -+ -+ org.apache.maven -+ maven-model-builder -+ jar -+ 3.5.4 -+ -+ -+ org.codehaus.plexus -+ plexus-interpolation -+ jar -+ 1.24 -+ -+ -+ org.apache.maven.wagon -+ wagon-provider-api -+ jar -+ 3.1.0 -+ -+ -+ org.apache.maven -+ maven-resolver-provider -+ jar -+ 3.5.4 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-api -+ jar -+ 1.1.1 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-util -+ jar -+ 1.1.1 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-impl -+ jar -+ 1.1.1 -+ -+ -+ org.slf4j -+ slf4j-api -+ jar -+ 1.7.25 -+ -+ -+ org.apache.maven -+ maven-settings-builder -+ jar -+ 3.5.4 -+ -+ -+ org.sonatype.plexus -+ plexus-sec-dispatcher -+ jar -+ 1.4 -+ -+ -+ org.sonatype.plexus -+ plexus-cipher -+ jar -+ 1.4 -+ -+ -+ junit -+ junit -+ jar -+ 3.8.2 -+ -+ -+ org.hamcrest -+ hamcrest-core -+ jar -+ 1.3 -+ + + -\ No newline at end of file ---- maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100 -+++ maven-plugin-tools-3.5.1/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 2019-04-01 15:30:13.541633043 +0200 +--- maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100 ++++ maven-plugin-tools-3.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 2019-11-25 11:01:29.241066576 +0100 @@ -0,0 +1,458 @@ + +package org.apache.maven.plugin.plugin; diff --git a/maven-plugin-plugin-bootstrap.changes b/maven-plugin-plugin-bootstrap.changes index d1a4bb7..c0454e3 100644 --- a/maven-plugin-plugin-bootstrap.changes +++ b/maven-plugin-plugin-bootstrap.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Nov 25 10:25:11 UTC 2019 - Fridrich Strba + +- Upgrade to upstream 3.6.0 + * allow building with java > 1.8 too against objectweb-asm 7.2 +- Removed patch: + * fix-getPluginsAsMap.patch + + fix is present in the updated sources +- Modified patch: + * maven-plugin-plugin-bootstrap-resouces.patch + + regenerate from the non-bootstrap build to correspond to + what is generate by the maven-plugin-plugin + ------------------------------------------------------------------- Fri Mar 29 17:04:37 UTC 2019 - Fridrich Strba diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index 25bebba..14ca31d 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/maven-plugin-plugin-bootstrap.spec @@ -19,7 +19,7 @@ %global base_name maven-plugin-tools %global artifactId maven-plugin-plugin Name: %{artifactId}-bootstrap -Version: 3.5.1 +Version: 3.6.0 Release: 0 Summary: Maven Plugin Plugin License: Apache-2.0 @@ -30,7 +30,6 @@ Source1: %{base_name}-build.tar.xz Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch -Patch10: fix-getPluginsAsMap.patch # The maven-plugin-plugin is used to generate those descriptors, which # creates a circular dependency of maven-plugin-plugin on itself. # We generated those ones outside the rpm build for a bootstrap package. @@ -58,7 +57,6 @@ BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) -BuildConflicts: java-devel >= 9 BuildArch: noarch %description @@ -72,57 +70,21 @@ artifact metadata and a generic help goal. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch10 -p1 %patch20 -p1 %pom_remove_plugin -r :maven-enforcer-plugin -# For com.sun:tools use scope "compile" instead of "system" -%pom_remove_dep com.sun:tools maven-plugin-tools-javadoc -%pom_add_dep com.sun:tools maven-plugin-tools-javadoc - %pom_xpath_inject "pom:project/pom:properties" " UTF-8 UTF-8" -# Remove test dependencies because tests are skipped anyways. -%pom_xpath_remove "pom:dependency[pom:scope='test']" - -# Use Maven 3.1.1 APIs -%pom_remove_dep :maven-project maven-plugin-plugin -%pom_remove_dep :maven-plugin-descriptor maven-plugin-plugin -%pom_remove_dep :maven-artifact-manager maven-plugin-plugin - # Why on the earth is this dependency there ??? %pom_remove_dep :maven-surefire-common maven-plugin-plugin -%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations -%pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations -%pom_change_dep :easymock :easymock::test maven-plugin-tools-annotations +# Remove test dependencies because tests are skipped anyways. +%pom_xpath_remove "pom:dependency[pom:scope='test']" -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-ant -%pom_change_dep :maven-project :maven-core maven-script/maven-plugin-tools-ant - -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-api -%pom_change_dep :maven-project :maven-core maven-plugin-tools-api - -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-beanshell - -%pom_remove_dep :maven-project maven-plugin-tools-generators -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-generators - -%pom_change_dep :maven-project :maven-core maven-plugin-tools-java -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-java - -%pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-script/maven-plugin-tools-model - -%pom_remove_dep :maven-project maven-script/maven-script-ant -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-script-ant -%pom_change_dep :easymock :easymock::test maven-script/maven-script-ant - -%pom_remove_dep :maven-project -%pom_remove_dep :maven-plugin-descriptor -%pom_add_dep org.apache.maven:maven-compat +%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations # For some reason, this dependency is not generated by javapackages-local # and for some reasons if we give it a scope 'runtime' it works diff --git a/maven-plugin-plugin.changes b/maven-plugin-plugin.changes index 5e59793..eea0f08 100644 --- a/maven-plugin-plugin.changes +++ b/maven-plugin-plugin.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Nov 25 10:29:02 UTC 2019 - Fridrich Strba + +- Upgrade to upstream 3.6.0 + * allow building with java > 1.8 too against objectweb-asm 7.2 +- Removed patch: + * fix-getPluginsAsMap.patch + + fix is present in the updated sources + ------------------------------------------------------------------- Sun Nov 24 17:30:49 UTC 2019 - Fridrich Strba diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index d30f9a0..29eb5ec 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -18,7 +18,7 @@ %global base_name maven-plugin-tools Name: maven-plugin-plugin -Version: 3.5.1 +Version: 3.6.0 Release: 0 Summary: Maven Plugin Plugin License: Apache-2.0 @@ -28,7 +28,6 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{ba Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch -Patch10: fix-getPluginsAsMap.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip @@ -79,14 +78,9 @@ API documentation for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch10 -p1 %pom_remove_plugin -r :maven-enforcer-plugin -# For com.sun:tools use scope "compile" instead of "system" -%pom_remove_dep com.sun:tools maven-plugin-tools-javadoc -%pom_add_dep com.sun:tools maven-plugin-tools-javadoc - %pom_xpath_inject "pom:project/pom:properties" " UTF-8 UTF-8" @@ -94,48 +88,17 @@ API documentation for %{name}. # Remove test dependencies because tests are skipped anyways. %pom_xpath_remove "pom:dependency[pom:scope='test']" -# Use Maven 3.1.1 APIs -%pom_remove_dep :maven-project maven-plugin-plugin -%pom_remove_dep :maven-plugin-descriptor maven-plugin-plugin -%pom_remove_dep :maven-plugin-registry maven-plugin-plugin -%pom_remove_dep :maven-artifact-manager maven-plugin-plugin - # Why on the earth is this dependency there ??? %pom_remove_dep :maven-surefire-common maven-plugin-plugin -%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations -%pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations - -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-ant -%pom_change_dep :maven-project :maven-core maven-script/maven-plugin-tools-ant - -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-api -%pom_change_dep :maven-project :maven-core maven-plugin-tools-api - -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-beanshell - -%pom_remove_dep :maven-project maven-plugin-tools-generators -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-generators - -%pom_change_dep :maven-project :maven-core maven-plugin-tools-java -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-java - -%pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-script/maven-plugin-tools-model - -%pom_remove_dep :maven-project maven-script/maven-script-ant -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-script-ant - -%pom_remove_dep :maven-project -%pom_remove_dep :maven-plugin-descriptor -%pom_add_dep org.apache.maven:maven-compat -%pom_add_dep org.apache.maven:maven-plugin-registry +%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations %build pushd %{name} %{mvn_file} :%{name} %{base_name}/%{name} %{mvn_build} -f \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -- -Dmaven.compiler.release=6 + -- -Dmaven.compiler.release=7 %endif popd diff --git a/maven-plugin-tools-3.5.1-source-release.zip b/maven-plugin-tools-3.5.1-source-release.zip deleted file mode 100644 index 7ca6867..0000000 --- a/maven-plugin-tools-3.5.1-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb1f44c5c17f8e2ec5904a49dcf122dd72504bb37d62f410a04737ef03740ef7 -size 769553 diff --git a/maven-plugin-tools-3.6.0-source-release.zip b/maven-plugin-tools-3.6.0-source-release.zip new file mode 100644 index 0000000..8a23342 --- /dev/null +++ b/maven-plugin-tools-3.6.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89f924e29820991f1d0542e94c060ad42152a6fc164fe7231d03b6815a432456 +size 701732 diff --git a/maven-plugin-tools-build.tar.xz b/maven-plugin-tools-build.tar.xz index b3364ac..00dac83 100644 --- a/maven-plugin-tools-build.tar.xz +++ b/maven-plugin-tools-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:403db339b5c010420ad3fda6420f9dde2529cc11ba3cd62750c172a3f704967c -size 4692 +oid sha256:6bdaaccff69e2fda7b2855efedc28763c0fc0ac0045e8a81c5c4318452bb7942 +size 4736 diff --git a/maven-plugin-tools.changes b/maven-plugin-tools.changes index d76b155..99b6c55 100644 --- a/maven-plugin-tools.changes +++ b/maven-plugin-tools.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Nov 25 10:18:49 UTC 2019 - Fridrich Strba + +- Upgrade to upstream 3.6.0 + * allow building with java > 1.8 too against objectweb-asm 7.2 + * maven-plugin-tools-javadoc component does not exist any more + * Renamed the package of documentation to + maven-plugin-tools-javadoc since there is no name clash any + more and it allows smooth upgrade +- Removed patch: + * fix-getPluginsAsMap.patch + + fix is present in the updated sources + ------------------------------------------------------------------- Fri Mar 29 13:22:25 UTC 2019 - Fridrich Strba diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 29c61b2..202caeb 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -17,7 +17,7 @@ Name: maven-plugin-tools -Version: 3.5.1 +Version: 3.6.0 Release: 0 Summary: Maven Plugin Tools License: Apache-2.0 @@ -28,7 +28,6 @@ Source1: %{name}-build.tar.xz Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch -Patch10: fix-getPluginsAsMap.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: atinject @@ -63,7 +62,6 @@ BuildRequires: xbean BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven:maven-parent:pom:) -BuildConflicts: java-devel >= 9 BuildArch: noarch %description @@ -120,20 +118,6 @@ Group: Development/Libraries/Java %description java Descriptor extractor for plugins written in Java. - -# Note that this package contains code, not documentation. -# See comments about "javadocs" subpackage below. -%package javadoc -Summary: Maven Plugin Tools Javadoc -Group: Development/Libraries/Java - -%description javadoc -The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when -generating Javadoc. - -Java API documentation for %{name} is contained in -%{name}-javadocs package. This package does not contain it. - %package model Summary: Maven Plugin Metadata Model Group: Development/Libraries/Java @@ -158,10 +142,11 @@ Group: Development/Libraries/Java This package provides %{summary}, which write Maven plugins with Beanshell scripts. -# The subpackage name "javadocs" instead of "javadoc" is intentional. -%package javadocs +%package javadoc Summary: Javadoc for %{name} Group: Development/Libraries/Java +Provides: %{name}-javadocs = %{version}-%{release} +Obsoletes: %{name}-javadocs < %{version}-%{release} %description javadocs API documentation for %{name}. @@ -171,14 +156,9 @@ API documentation for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch10 -p1 %pom_remove_plugin -r :maven-enforcer-plugin -# For com.sun:tools use scope "compile" instead of "system" -%pom_remove_dep com.sun:tools maven-plugin-tools-javadoc -%pom_add_dep com.sun:tools maven-plugin-tools-javadoc - %pom_xpath_inject "pom:project/pom:properties" " UTF-8 UTF-8" @@ -186,39 +166,7 @@ API documentation for %{name}. # Remove test dependencies because tests are skipped anyways. %pom_xpath_remove "pom:dependency[pom:scope='test']" -# Use Maven 3.1.1 APIs -%pom_remove_dep :maven-project maven-plugin-plugin -%pom_remove_dep :maven-plugin-descriptor maven-plugin-plugin -%pom_remove_dep :maven-plugin-registry maven-plugin-plugin -%pom_remove_dep :maven-artifact-manager maven-plugin-plugin - -%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations -%pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations -%pom_change_dep :easymock :easymock::test maven-plugin-tools-annotations - -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-ant -%pom_change_dep :maven-project :maven-core maven-script/maven-plugin-tools-ant - -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-api -%pom_change_dep :maven-project :maven-core maven-plugin-tools-api - -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-beanshell - -%pom_remove_dep :maven-project maven-plugin-tools-generators -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-generators - -%pom_change_dep :maven-project :maven-core maven-plugin-tools-java -%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-java - -%pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-script/maven-plugin-tools-model - -%pom_remove_dep :maven-project maven-script/maven-script-ant -%pom_remove_dep :maven-plugin-descriptor maven-script/maven-script-ant -%pom_change_dep :easymock :easymock::test maven-script/maven-script-ant - -%pom_remove_dep :maven-project -%pom_remove_dep :maven-plugin-descriptor -%pom_add_dep org.apache.maven:maven-compat +%pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations %{mvn_package} :maven-plugin-tools __noinstall %{mvn_package} :maven-script __noinstall @@ -275,8 +223,7 @@ for i in \ maven-plugin-tools-annotations \ maven-plugin-tools-api \ maven-plugin-tools-generators \ - maven-plugin-tools-java \ - maven-plugin-tools-javadoc; do + maven-plugin-tools-java; do %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar if [ -d ${i}/target/site/apidocs ]; then cp -r ${i}/target/site/apidocs target/site/apidocs/${i} @@ -314,8 +261,6 @@ done %files java -f .mfiles-maven-plugin-tools-java -%files javadoc -f .mfiles-maven-plugin-tools-javadoc - %files model -f .mfiles-maven-plugin-tools-model %license LICENSE NOTICE @@ -325,7 +270,7 @@ done %files -n maven-script-beanshell -f .mfiles-maven-script-beanshell %license LICENSE NOTICE -%files javadocs -f .mfiles-javadoc +%files javadoc -f .mfiles-javadoc %license LICENSE NOTICE %changelog From 73abfcb62b9157de4705c98842b99ba72a6a5a845978f439b0d6a734c86f3326 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Nov 2019 10:33:29 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=19 --- maven-plugin-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 202caeb..a1c3f6d 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -148,7 +148,7 @@ Group: Development/Libraries/Java Provides: %{name}-javadocs = %{version}-%{release} Obsoletes: %{name}-javadocs < %{version}-%{release} -%description javadocs +%description javadoc API documentation for %{name}. %prep