pool/maven-plugin-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=18

Browse Source
This commit is contained in:
Fridrich Strba 2019-11-25 10:29:24 +00:00 committed by Git OBS Bridge
parent bec7d3b417
commit ab43336da1
11 changed files with 275 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fix-getPluginsAsMap.patch
View File

@ -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<String, Object> pluginsAsMap )
+ private static Plugin getCompilerPlugin( Map<String, Plugin> 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 )

601
maven-plugin-plugin-bootstrap-resouces.patch
View File

@ -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.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.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 +++ 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,419 @@ @@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
+<plugin> +<plugin>
+ <name>${project.name}</name> + <name>${project.name}</name>
@ -59,7 +59,9 @@
+ <mojo> + <mojo>
+ <goal>descriptor</goal> + <goal>descriptor</goal>
+ <description>Generate a plugin descriptor. + <description>Generate a plugin descriptor.
+Note: Since 3.0, for Java 5 plugin annotations support, default phase defined by this goal is after the &apos;compilation&apos; of any scripts. This doesn&apos;t override the default binding coded at generate-resources phase in Maven core.</description> +
+Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the &apos;compilation&apos; of any scripts. This doesn&apos;t override the default binding coded at generate-resources phase in Maven core.
+</description>
+ <requiresDependencyResolution>runtime</requiresDependencyResolution> + <requiresDependencyResolution>runtime</requiresDependencyResolution>
+ <requiresDirectInvocation>false</requiresDirectInvocation> + <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject> + <requiresProject>true</requiresProject>
@ -111,7 +113,9 @@
+ <required>false</required> + <required>false</required>
+ <editable>true</editable> + <editable>true</editable>
+ <description>Generate a plugin descriptor. + <description>Generate a plugin descriptor.
+Note: Since 3.0, for Java 5 plugin annotations support, default phase defined by this goal is after the &apos;compilation&apos; of any scripts. This doesn&apos;t override the default binding coded at generate-resources phase in Maven core.</description> +
+Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the &apos;compilation&apos; of any scripts. This doesn&apos;t override the default binding coded at generate-resources phase in Maven core.
+</description>
+ </parameter> + </parameter>
+ <parameter> + <parameter>
+ <name>packagingTypes</name> + <name>packagingTypes</name>
@ -136,7 +140,9 @@
+ <required>false</required> + <required>false</required>
+ <editable>true</editable> + <editable>true</editable>
+ <description>Generate a plugin descriptor. + <description>Generate a plugin descriptor.
+Note: Since 3.0, for Java 5 plugin annotations support, default phase defined by this goal is after the &apos;compilation&apos; of any scripts. This doesn&apos;t override the default binding coded at generate-resources phase in Maven core.</description> +
+Note: Since 3.0, for Java plugin annotations support, default phase defined by this goal is after the &apos;compilation&apos; of any scripts. This doesn&apos;t override the default binding coded at generate-resources phase in Maven core.
+</description>
+ </parameter> + </parameter>
+ <parameter> + <parameter>
+ <name>skipErrorNoDescriptorsFound</name> + <name>skipErrorNoDescriptorsFound</name>
@ -378,52 +384,11 @@
+ <skipReport implementation="boolean" default-value="false">${maven.plugin.report.skip}</skipReport> + <skipReport implementation="boolean" default-value="false">${maven.plugin.report.skip}</skipReport>
+ </configuration> + </configuration>
+ </mojo> + </mojo>
+ <mojo>
+ <goal>updateRegistry</goal>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <phase>install</phase>
+ <implementation>org.apache.maven.plugin.plugin.UpdatePluginRegistryMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <since>2.0</since>
+ <deprecated>plugin registry has been removed from Maven 3, this goal will be removed in next release</deprecated>
+ <threadSafe>true</threadSafe>
+ <parameters>
+ <parameter>
+ <name>skip</name>
+ <type>boolean</type>
+ <since>2.8</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ <parameter>
+ <name>skipUpdatePluginRegistry</name>
+ <type>boolean</type>
+ <since>2.8</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <skip implementation="boolean" default-value="false">${maven.plugin.skip}</skip>
+ <skipUpdatePluginRegistry implementation="boolean" default-value="false">${maven.plugin.update.registry.skip}</skipUpdatePluginRegistry>
+ </configuration>
+ </mojo>
+ </mojos> + </mojos>
+</plugin> +</plugin>
\ No newline at end of file --- 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.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.6.0/maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-11-25 11:05:03.978261704 +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,1062 @@
@@ -0,0 +1,1185 @@
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
+<plugin> +<plugin>
+ <name>${project.name}</name> + <name>${project.name}</name>
@ -514,13 +479,16 @@
+ </mojo> + </mojo>
+ <mojo> + <mojo>
+ <goal>descriptor</goal> + <goal>descriptor</goal>
+ <description>Generate a plugin descriptor. + <description>&lt;p&gt;
+&lt;br/&gt; +Generate a plugin descriptor.
+&lt;b&gt;Note:&lt;/b&gt; Since 3.0, for Java 5 plugin annotations support, +&lt;/p&gt;
+&lt;p&gt;
+&lt;b&gt;Note:&lt;/b&gt; Since 3.0, for Java plugin annotations support,
+default &lt;a href=&quot;http://maven.apache.org/ref/current/maven-core/lifecycles.html&quot;&gt;phase&lt;/a&gt; +default &lt;a href=&quot;http://maven.apache.org/ref/current/maven-core/lifecycles.html&quot;&gt;phase&lt;/a&gt;
+defined by this goal is after the &quot;compilation&quot; of any scripts. This doesn&apos;t override +defined by this goal is after the &quot;compilation&quot; of any scripts. This doesn&apos;t override
+&lt;a href=&quot;/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging&quot;&gt;the default binding coded +&lt;a href=&quot;/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging&quot;&gt;the default binding coded
+at generate-resources phase&lt;/a&gt; in Maven core.</description> +at generate-resources phase&lt;/a&gt; in Maven core.
+&lt;/p&gt;</description>
+ <requiresDependencyResolution>runtime</requiresDependencyResolution> + <requiresDependencyResolution>runtime</requiresDependencyResolution>
+ <requiresDirectInvocation>false</requiresDirectInvocation> + <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject> + <requiresProject>true</requiresProject>
@ -587,13 +555,16 @@
+ <type>java.io.File</type> + <type>java.io.File</type>
+ <required>false</required> + <required>false</required>
+ <editable>true</editable> + <editable>true</editable>
+ <description>Generate a plugin descriptor. + <description>&lt;p&gt;
+&lt;br/&gt; +Generate a plugin descriptor.
+&lt;b&gt;Note:&lt;/b&gt; Since 3.0, for Java 5 plugin annotations support, +&lt;/p&gt;
+&lt;p&gt;
+&lt;b&gt;Note:&lt;/b&gt; Since 3.0, for Java plugin annotations support,
+default &lt;a href=&quot;http://maven.apache.org/ref/current/maven-core/lifecycles.html&quot;&gt;phase&lt;/a&gt; +default &lt;a href=&quot;http://maven.apache.org/ref/current/maven-core/lifecycles.html&quot;&gt;phase&lt;/a&gt;
+defined by this goal is after the &quot;compilation&quot; of any scripts. This doesn&apos;t override +defined by this goal is after the &quot;compilation&quot; of any scripts. This doesn&apos;t override
+&lt;a href=&quot;/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging&quot;&gt;the default binding coded +&lt;a href=&quot;/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging&quot;&gt;the default binding coded
+at generate-resources phase&lt;/a&gt; in Maven core.</description> +at generate-resources phase&lt;/a&gt; in Maven core.
+&lt;/p&gt;</description>
+ </parameter> + </parameter>
+ <parameter> + <parameter>
+ <name>packagingTypes</name> + <name>packagingTypes</name>
@ -632,13 +603,16 @@
+ <since>2.6</since> + <since>2.6</since>
+ <required>false</required> + <required>false</required>
+ <editable>true</editable> + <editable>true</editable>
+ <description>Generate a plugin descriptor. + <description>&lt;p&gt;
+&lt;br/&gt; +Generate a plugin descriptor.
+&lt;b&gt;Note:&lt;/b&gt; Since 3.0, for Java 5 plugin annotations support, +&lt;/p&gt;
+&lt;p&gt;
+&lt;b&gt;Note:&lt;/b&gt; Since 3.0, for Java plugin annotations support,
+default &lt;a href=&quot;http://maven.apache.org/ref/current/maven-core/lifecycles.html&quot;&gt;phase&lt;/a&gt; +default &lt;a href=&quot;http://maven.apache.org/ref/current/maven-core/lifecycles.html&quot;&gt;phase&lt;/a&gt;
+defined by this goal is after the &quot;compilation&quot; of any scripts. This doesn&apos;t override +defined by this goal is after the &quot;compilation&quot; of any scripts. This doesn&apos;t override
+&lt;a href=&quot;/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging&quot;&gt;the default binding coded +&lt;a href=&quot;/ref/current/maven-core/default-bindings.html#Bindings_for_maven-plugin_packaging&quot;&gt;the default binding coded
+at generate-resources phase&lt;/a&gt; in Maven core.</description> +at generate-resources phase&lt;/a&gt; in Maven core.
+&lt;/p&gt;</description>
+ </parameter> + </parameter>
+ <parameter> + <parameter>
+ <name>skipErrorNoDescriptorsFound</name> + <name>skipErrorNoDescriptorsFound</name>
@ -1023,97 +997,37 @@
+ </requirement> + </requirement>
+ </requirements> + </requirements>
+ </mojo> + </mojo>
+ <mojo>
+ <goal>updateRegistry</goal>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <phase>install</phase>
+ <implementation>org.apache.maven.plugin.plugin.UpdatePluginRegistryMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <since>2.0</since>
+ <deprecated>plugin registry has been removed from Maven 3, this goal will be removed in next release</deprecated>
+ <threadSafe>true</threadSafe>
+ <parameters>
+ <parameter>
+ <name>artifactId</name>
+ <type>java.lang.String</type>
+ <required>true</required>
+ <editable>false</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ <parameter>
+ <name>groupId</name>
+ <type>java.lang.String</type>
+ <required>true</required>
+ <editable>false</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ <parameter>
+ <name>skip</name>
+ <type>boolean</type>
+ <since>2.8</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ <parameter>
+ <name>skipUpdatePluginRegistry</name>
+ <type>boolean</type>
+ <since>2.8</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ <parameter>
+ <name>usePluginRegistry</name>
+ <type>boolean</type>
+ <required>true</required>
+ <editable>false</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ <parameter>
+ <name>version</name>
+ <type>java.lang.String</type>
+ <required>true</required>
+ <editable>false</editable>
+ <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <artifactId implementation="java.lang.String" default-value="${project.artifactId}"/>
+ <groupId implementation="java.lang.String" default-value="${project.groupId}"/>
+ <skip implementation="boolean" default-value="false">${maven.plugin.skip}</skip>
+ <skipUpdatePluginRegistry implementation="boolean" default-value="false">${maven.plugin.update.registry.skip}</skipUpdatePluginRegistry>
+ <usePluginRegistry implementation="boolean" default-value="${settings.usePluginRegistry}"/>
+ <version implementation="java.lang.String" default-value="${project.artifact.version}"/>
+ </configuration>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
+ <field-name>pluginRegistryBuilder</field-name>
+ </requirement>
+ </requirements>
+ </mojo>
+ </mojos> + </mojos>
+ <dependencies> + <dependencies>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId> + <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId> + <artifactId>maven-compat</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.5.1</version> + <version>3.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId> + <artifactId>maven-settings</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.2.1</version> + <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ <type>jar</type>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId>
+ <type>jar</type>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <type>jar</type>
+ <version>1</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.eclipse.sisu</groupId> + <groupId>org.eclipse.sisu</groupId>
@ -1140,16 +1054,46 @@
+ <version>any</version> + <version>any</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>com.google.guava</groupId> + <groupId>org.codehaus.plexus</groupId>
+ <artifactId>guava</artifactId> + <artifactId>plexus-interpolation</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>20.0</version> + <version>1.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <type>jar</type>
+ <version>3.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <type>jar</type>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-spi</artifactId>
+ <type>jar</type>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <type>jar</type>
+ <version>3.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>com.google.inject</groupId> + <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId> + <artifactId>guice</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>4.2.0</version> + <version>4.2.1</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>aopalliance</groupId> + <groupId>aopalliance</groupId>
@ -1158,52 +1102,70 @@
+ <version>1.0</version> + <version>1.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>javax.inject</groupId> + <groupId>cglib</groupId>
+ <artifactId>javax.inject</artifactId> + <artifactId>cglib</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>1</version> + <version>3.2.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.resolver</groupId> + <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-spi</artifactId> + <artifactId>maven-resolver-api</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>1.1.1</version> + <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <type>jar</type>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <type>jar</type>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <type>jar</type>
+ <version>1.5.5</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId> + <artifactId>maven-settings-builder</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.5.4</version> + <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-sec-dispatcher</artifactId>
+ <type>jar</type>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-cipher</artifactId>
+ <type>jar</type>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <type>jar</type>
+ <version>0.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ <type>jar</type>
+ <version>3.6.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId> + <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-generators</artifactId> + <artifactId>maven-plugin-tools-generators</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.5.1</version> + <version>3.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ <version>5.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ <version>5.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <type>jar</type>
+ <version>6.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <type>jar</type>
+ <version>6.2.1</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>net.sf.jtidy</groupId> + <groupId>net.sf.jtidy</groupId>
@ -1218,16 +1180,34 @@
+ <version>1.0</version> + <version>1.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ <version>7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <type>jar</type>
+ <version>7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <type>jar</type>
+ <version>7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ <version>7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId> + <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-java</artifactId> + <artifactId>maven-plugin-tools-java</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.5.1</version> + <version>3.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <type>jar</type>
+ <version>1.5.5</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>com.thoughtworks.qdox</groupId> + <groupId>com.thoughtworks.qdox</groupId>
@ -1239,25 +1219,25 @@
+ <groupId>org.apache.maven.plugin-tools</groupId> + <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-annotations</artifactId> + <artifactId>maven-plugin-tools-annotations</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.5.1</version> + <version>3.6.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.codehaus.plexus</groupId> + <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId> + <artifactId>plexus-archiver</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.1.1</version> + <version>3.6.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.codehaus.plexus</groupId> + <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-io</artifactId> + <artifactId>plexus-io</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.0.1</version> + <version>3.2.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.commons</groupId> + <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId> + <artifactId>commons-compress</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>1.16.1</version> + <version>1.19</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.tukaani</groupId> + <groupId>org.tukaani</groupId>
@ -1266,28 +1246,10 @@
+ <version>1.8</version> + <version>1.8</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <type>jar</type>
+ <version>SYSTEM</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <type>jar</type>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <type>jar</type>
+ <version>3.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId> + <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId> + <artifactId>maven-plugin-annotations</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.5.1</version> + <version>3.6.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.doxia</groupId> + <groupId>org.apache.maven.doxia</groupId>
@ -1309,15 +1271,27 @@
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.doxia</groupId> + <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-decoration-model</artifactId>
+ <type>jar</type>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <type>jar</type>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId> + <artifactId>doxia-core</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>1.7</version> + <version>1.7</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>xmlunit</groupId> + <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>xmlunit</artifactId> + <artifactId>httpcore</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>1.5</version> + <version>4.0.1</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.httpcomponents</groupId> + <groupId>org.apache.httpcomponents</groupId>
@ -1329,31 +1303,19 @@
+ <groupId>commons-logging</groupId> + <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId> + <artifactId>commons-logging</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>SYSTEM</version> + <version>any</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>commons-codec</groupId> + <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId> + <artifactId>commons-codec</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>SYSTEM</version> + <version>any</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.httpcomponents</groupId> + <groupId>xmlunit</groupId>
+ <artifactId>httpcore</artifactId> + <artifactId>xmlunit</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>4.0.1</version> + <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-decoration-model</artifactId>
+ <type>jar</type>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-skin-model</artifactId>
+ <type>jar</type>
+ <version>1.7.5</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.doxia</groupId> + <groupId>org.apache.maven.doxia</groupId>
@ -1368,52 +1330,46 @@
+ <version>1.0-beta-7</version> + <version>1.0-beta-7</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <type>jar</type>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId> + <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId> + <artifactId>commons-lang3</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.5</version> + <version>3.5</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-skin-model</artifactId>
+ <type>jar</type>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId> + <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.2.1</version> + <version>3.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.codehaus.plexus</groupId> + <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId> + <artifactId>plexus-classworlds</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.5.2</version> + <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <type>jar</type>
+ <version>0.3.3</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId> + <artifactId>maven-model</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.2.1</version> + <version>3.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId> + <artifactId>maven-repository-metadata</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.2.1</version> + <version>3.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId> + <artifactId>maven-artifact</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.2.1</version> + <version>3.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.reporting</groupId> + <groupId>org.apache.maven.reporting</groupId>
@ -1428,6 +1384,12 @@
+ <version>3.2.0</version> + <version>3.2.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId> + <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId> + <artifactId>maven-reporting-api</artifactId>
+ <type>jar</type> + <type>jar</type>
@ -1455,51 +1417,27 @@
+ <groupId>org.apache.xbean</groupId> + <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId> + <artifactId>xbean-reflect</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>3.7</version> + <version>SYSTEM</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.surefire</groupId> + <groupId>com.google.guava</groupId>
+ <artifactId>maven-surefire-common</artifactId> + <artifactId>guava</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.19.1</version> + <version>20.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.surefire</groupId> + <groupId>junit</groupId>
+ <artifactId>surefire-api</artifactId> + <artifactId>junit</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>2.22.0</version> + <version>SYSTEM</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven.surefire</groupId> + <groupId>org.hamcrest</groupId>
+ <artifactId>surefire-logger-api</artifactId> + <artifactId>hamcrest-core</artifactId>
+ <type>jar</type>
+ <version>2.22.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <type>jar</type>
+ <version>2.22.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-common-artifact-filters</artifactId>
+ <type>jar</type> + <type>jar</type>
+ <version>1.3</version> + <version>1.3</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-java</artifactId>
+ <type>jar</type>
+ <version>0.9.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId> + <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId> + <artifactId>velocity</artifactId>
+ <type>jar</type> + <type>jar</type>
@ -1511,107 +1449,10 @@
+ <type>jar</type> + <type>jar</type>
+ <version>2.4</version> + <version>2.4</version>
+ </dependency> + </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-registry</artifactId>
+ <type>jar</type>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <type>jar</type>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <type>jar</type>
+ <version>1.24</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <type>jar</type>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-sec-dispatcher</artifactId>
+ <type>jar</type>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-cipher</artifactId>
+ <type>jar</type>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <type>jar</type>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <type>jar</type>
+ <version>1.3</version>
+ </dependency>
+ </dependencies> + </dependencies>
+</plugin> +</plugin>
\ No newline at end of file --- 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.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.6.0/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 2019-11-25 11:01:29.241066576 +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
@@ -0,0 +1,458 @@ @@ -0,0 +1,458 @@
+ +
+package org.apache.maven.plugin.plugin; +package org.apache.maven.plugin.plugin;

13
maven-plugin-plugin-bootstrap.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Nov 25 10:25:11 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Fri Mar 29 17:04:37 UTC 2019 - Fridrich Strba <fstrba@suse.com>

46
maven-plugin-plugin-bootstrap.spec
View File

@ -19,7 +19,7 @@
%global base_name maven-plugin-tools %global base_name maven-plugin-tools
%global artifactId maven-plugin-plugin %global artifactId maven-plugin-plugin
Name: %{artifactId}-bootstrap Name: %{artifactId}-bootstrap
Version: 3.5.1 Version: 3.6.0
Release: 0 Release: 0
Summary: Maven Plugin Plugin Summary: Maven Plugin Plugin
License: Apache-2.0 License: Apache-2.0
@ -30,7 +30,6 @@ Source1: %{base_name}-build.tar.xz
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.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 # The maven-plugin-plugin is used to generate those descriptors, which
# creates a circular dependency of maven-plugin-plugin on itself. # creates a circular dependency of maven-plugin-plugin on itself.
# We generated those ones outside the rpm build for a bootstrap package. # 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-annotations)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildConflicts: java-devel >= 9
BuildArch: noarch BuildArch: noarch
%description %description
@ -72,57 +70,21 @@ artifact metadata and a generic help goal.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch10 -p1
%patch20 -p1 %patch20 -p1
%pom_remove_plugin -r :maven-enforcer-plugin %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" " %pom_xpath_inject "pom:project/pom:properties" "
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>" <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
# 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 ??? # Why on the earth is this dependency there ???
%pom_remove_dep :maven-surefire-common maven-plugin-plugin %pom_remove_dep :maven-surefire-common maven-plugin-plugin
%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations # Remove test dependencies because tests are skipped anyways.
%pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations %pom_xpath_remove "pom:dependency[pom:scope='test']"
%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 org.easymock:easymock:: :::test maven-plugin-tools-annotations
%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
# For some reason, this dependency is not generated by javapackages-local # For some reason, this dependency is not generated by javapackages-local
# and for some reasons if we give it a scope 'runtime' it works # and for some reasons if we give it a scope 'runtime' it works

9
maven-plugin-plugin.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Nov 25 10:29:02 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Sun Nov 24 17:30:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>

43
maven-plugin-plugin.spec
View File

@ -18,7 +18,7 @@
%global base_name maven-plugin-tools %global base_name maven-plugin-tools
Name: maven-plugin-plugin Name: maven-plugin-plugin
Version: 3.5.1 Version: 3.6.0
Release: 0 Release: 0
Summary: Maven Plugin Plugin Summary: Maven Plugin Plugin
License: Apache-2.0 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 Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
Patch10: fix-getPluginsAsMap.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: unzip BuildRequires: unzip
@ -79,14 +78,9 @@ API documentation for %{name}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch10 -p1
%pom_remove_plugin -r :maven-enforcer-plugin %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" " %pom_xpath_inject "pom:project/pom:properties" "
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>" <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
@ -94,48 +88,17 @@ API documentation for %{name}.
# Remove test dependencies because tests are skipped anyways. # Remove test dependencies because tests are skipped anyways.
%pom_xpath_remove "pom:dependency[pom:scope='test']" %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 ??? # Why on the earth is this dependency there ???
%pom_remove_dep :maven-surefire-common maven-plugin-plugin %pom_remove_dep :maven-surefire-common maven-plugin-plugin
%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations %pom_change_dep org.easymock:easymock:: :::test 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
%build %build
pushd %{name} pushd %{name}
%{mvn_file} :%{name} %{base_name}/%{name} %{mvn_file} :%{name} %{base_name}/%{name}
%{mvn_build} -f \ %{mvn_build} -f \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=6 -- -Dmaven.compiler.release=7
%endif %endif
popd popd

3
maven-plugin-tools-3.5.1-source-release.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb1f44c5c17f8e2ec5904a49dcf122dd72504bb37d62f410a04737ef03740ef7
size 769553

BIN
maven-plugin-tools-3.6.0-source-release.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
maven-plugin-tools-build.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:403db339b5c010420ad3fda6420f9dde2529cc11ba3cd62750c172a3f704967c oid sha256:6bdaaccff69e2fda7b2855efedc28763c0fc0ac0045e8a81c5c4318452bb7942
size 4692 size 4736

13
maven-plugin-tools.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Nov 25 10:18:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Fri Mar 29 13:22:25 UTC 2019 - Fridrich Strba <fstrba@suse.com>

69
maven-plugin-tools.spec
View File

@ -17,7 +17,7 @@
Name: maven-plugin-tools Name: maven-plugin-tools
Version: 3.5.1 Version: 3.6.0
Release: 0 Release: 0
Summary: Maven Plugin Tools Summary: Maven Plugin Tools
License: Apache-2.0 License: Apache-2.0
@ -28,7 +28,6 @@ Source1: %{name}-build.tar.xz
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
Patch10: fix-getPluginsAsMap.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-cli BuildRequires: apache-commons-cli
BuildRequires: atinject BuildRequires: atinject
@ -63,7 +62,6 @@ BuildRequires: xbean
BuildRequires: xmvn-install BuildRequires: xmvn-install
BuildRequires: xmvn-resolve BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildConflicts: java-devel >= 9
BuildArch: noarch BuildArch: noarch
%description %description
@ -120,20 +118,6 @@ Group: Development/Libraries/Java
%description java %description java
Descriptor extractor for plugins written in 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 %package model
Summary: Maven Plugin Metadata Model Summary: Maven Plugin Metadata Model
Group: Development/Libraries/Java Group: Development/Libraries/Java
@ -158,10 +142,11 @@ Group: Development/Libraries/Java
This package provides %{summary}, which write Maven plugins with This package provides %{summary}, which write Maven plugins with
Beanshell scripts. Beanshell scripts.
# The subpackage name "javadocs" instead of "javadoc" is intentional. %package javadoc
%package javadocs
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
Group: Development/Libraries/Java Group: Development/Libraries/Java
Provides: %{name}-javadocs = %{version}-%{release}
Obsoletes: %{name}-javadocs < %{version}-%{release}
%description javadocs %description javadocs
API documentation for %{name}. API documentation for %{name}.
@ -171,14 +156,9 @@ API documentation for %{name}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch10 -p1
%pom_remove_plugin -r :maven-enforcer-plugin %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" " %pom_xpath_inject "pom:project/pom:properties" "
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>" <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
@ -186,39 +166,7 @@ API documentation for %{name}.
# Remove test dependencies because tests are skipped anyways. # Remove test dependencies because tests are skipped anyways.
%pom_xpath_remove "pom:dependency[pom:scope='test']" %pom_xpath_remove "pom:dependency[pom:scope='test']"
# Use Maven 3.1.1 APIs %pom_change_dep org.easymock:easymock:: :::test maven-plugin-tools-annotations
%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
%{mvn_package} :maven-plugin-tools __noinstall %{mvn_package} :maven-plugin-tools __noinstall
%{mvn_package} :maven-script __noinstall %{mvn_package} :maven-script __noinstall
@ -275,8 +223,7 @@ for i in \
maven-plugin-tools-annotations \ maven-plugin-tools-annotations \
maven-plugin-tools-api \ maven-plugin-tools-api \
maven-plugin-tools-generators \ maven-plugin-tools-generators \
maven-plugin-tools-java \ maven-plugin-tools-java; do
maven-plugin-tools-javadoc; do
%{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar
if [ -d ${i}/target/site/apidocs ]; then if [ -d ${i}/target/site/apidocs ]; then
cp -r ${i}/target/site/apidocs target/site/apidocs/${i} cp -r ${i}/target/site/apidocs target/site/apidocs/${i}
@ -314,8 +261,6 @@ done
%files java -f .mfiles-maven-plugin-tools-java %files java -f .mfiles-maven-plugin-tools-java
%files javadoc -f .mfiles-maven-plugin-tools-javadoc
%files model -f .mfiles-maven-plugin-tools-model %files model -f .mfiles-maven-plugin-tools-model
%license LICENSE NOTICE %license LICENSE NOTICE
@ -325,7 +270,7 @@ done
%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell %files -n maven-script-beanshell -f .mfiles-maven-script-beanshell
%license LICENSE NOTICE %license LICENSE NOTICE
%files javadocs -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog