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

maven-jar-plugin-3.1.0-source-release.zip

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

maven-jar-plugin-3.2.0-source-release.zip

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

maven-jar-plugin-bootstrap-resources.patch

@@ -1,6 +1,6 @@
---- maven-jar-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml	1970-01-01 01:00:00.000000000 +0100
+--- maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml	1970-01-01 01:00:00.000000000 +0100
-+++ maven-jar-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml	2019-03-31 13:45:21.731102271 +0200
++++ maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml	2019-11-25 18:27:09.361408438 +0100
-@@ -0,0 +1,200 @@
+@@ -0,0 +1,218 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<plugin>
 +  <name>${project.name}</name>
@@ -77,6 +77,14 @@
 +          <description>Base class for creating a jar from project classes.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Base class for creating a jar from project classes.</description>
++        </parameter>
++        <parameter>
 +          <name>skipIfEmpty</name>
 +          <type>boolean</type>
 +          <required>false</required>
@@ -96,6 +104,7 @@
 +        <classesDirectory implementation="java.io.File" default-value="${project.build.outputDirectory}"/>
 +        <forceCreation implementation="boolean" default-value="false">${maven.jar.forceCreation}</forceCreation>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <skipIfEmpty implementation="boolean" default-value="false"/>
 +        <useDefaultManifestFile implementation="boolean" default-value="false">${jar.useDefaultManifestFile}</useDefaultManifestFile>
 +      </configuration>
@@ -160,6 +169,14 @@
 +          <description>Base class for creating a jar from project classes.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Base class for creating a jar from project classes.</description>
++        </parameter>
++        <parameter>
 +          <name>skip</name>
 +          <type>boolean</type>
 +          <required>false</required>
@@ -193,6 +210,7 @@
 +        <classifier implementation="java.lang.String" default-value="tests"/>
 +        <forceCreation implementation="boolean" default-value="false">${maven.jar.forceCreation}</forceCreation>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <skip implementation="boolean">${maven.test.skip}</skip>
 +        <skipIfEmpty implementation="boolean" default-value="false"/>
 +        <testClassesDirectory implementation="java.io.File" default-value="${project.build.testOutputDirectory}"/>
@@ -201,9 +219,9 @@
 +    </mojo>
 +  </mojos>
 +</plugin>
---- maven-jar-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml	1970-01-01 01:00:00.000000000 +0100
+--- maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/plugin.xml	1970-01-01 01:00:00.000000000 +0100
-+++ maven-jar-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml	2019-03-31 13:42:26.566107104 +0200
++++ maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/plugin.xml	2019-11-25 18:26:17.657117466 +0100
-@@ -0,0 +1,514 @@
+@@ -0,0 +1,548 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<plugin>
 +  <name>${project.name}</name>
@@ -289,6 +307,14 @@
 +          <description>Base class for creating a jar from project classes.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Base class for creating a jar from project classes.</description>
++        </parameter>
++        <parameter>
 +          <name>project</name>
 +          <type>org.apache.maven.project.MavenProject</type>
 +          <required>true</required>
@@ -323,6 +349,7 @@
 +        <finalName implementation="java.lang.String" default-value="${project.build.finalName}"/>
 +        <forceCreation implementation="boolean" default-value="false">${maven.jar.forceCreation}</forceCreation>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
 +        <session implementation="org.apache.maven.execution.MavenSession" default-value="${session}"/>
 +        <skipIfEmpty implementation="boolean" default-value="false"/>
@@ -330,9 +357,8 @@
 +      </configuration>
 +      <requirements>
 +        <requirement>
-+          <role>org.codehaus.plexus.archiver.Archiver</role>
++          <role>java.util.Map</role>
-+          <role-hint>jar</role-hint>
++          <field-name>archivers</field-name>
-+          <field-name>jarArchiver</field-name>
 +        </requirement>
 +        <requirement>
 +          <role>org.apache.maven.project.MavenProjectHelper</role>
@@ -407,6 +433,14 @@
 +          <description>Base class for creating a jar from project classes.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Base class for creating a jar from project classes.</description>
++        </parameter>
++        <parameter>
 +          <name>project</name>
 +          <type>org.apache.maven.project.MavenProject</type>
 +          <required>true</required>
@@ -455,6 +489,7 @@
 +        <finalName implementation="java.lang.String" default-value="${project.build.finalName}"/>
 +        <forceCreation implementation="boolean" default-value="false">${maven.jar.forceCreation}</forceCreation>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
 +        <session implementation="org.apache.maven.execution.MavenSession" default-value="${session}"/>
 +        <skip implementation="boolean">${maven.test.skip}</skip>
@@ -464,9 +499,8 @@
 +      </configuration>
 +      <requirements>
 +        <requirement>
-+          <role>org.codehaus.plexus.archiver.Archiver</role>
++          <role>java.util.Map</role>
-+          <role-hint>jar</role-hint>
++          <field-name>archivers</field-name>
-+          <field-name>jarArchiver</field-name>
 +        </requirement>
 +        <requirement>
 +          <role>org.apache.maven.project.MavenProjectHelper</role>
@@ -486,13 +520,13 @@
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-model</artifactId>
 +      <type>jar</type>
-+      <version>3.5.4</version>
++      <version>3.6.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-classworlds</artifactId>
 +      <type>jar</type>
-+      <version>2.5.2</version>
++      <version>2.6.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.eclipse.sisu</groupId>
@@ -510,13 +544,13 @@
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-settings</artifactId>
 +      <type>jar</type>
-+      <version>3.5.4</version>
++      <version>3.6.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.resolver</groupId>
 +      <artifactId>maven-resolver-util</artifactId>
 +      <type>jar</type>
-+      <version>1.1.1</version>
++      <version>1.4.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
@@ -549,22 +583,10 @@
 +      <version>any</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>com.google.guava</groupId>
-+      <artifactId>guava</artifactId>
-+      <type>jar</type>
-+      <version>20.0</version>
-+    </dependency>
-+    <dependency>
 +      <groupId>com.google.inject</groupId>
 +      <artifactId>guice</artifactId>
 +      <type>jar</type>
-+      <version>4.2.0</version>
++      <version>4.2.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>cglib</groupId>
-+      <artifactId>cglib</artifactId>
-+      <type>jar</type>
-+      <version>3.2.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>aopalliance</groupId>
@@ -573,22 +595,40 @@
 +      <version>1.0</version>
 +    </dependency>
 +    <dependency>
++      <groupId>cglib</groupId>
++      <artifactId>cglib</artifactId>
++      <type>jar</type>
++      <version>3.2.0</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.ow2.asm</groupId>
 +      <artifactId>asm</artifactId>
 +      <type>jar</type>
 +      <version>5.0.3</version>
 +    </dependency>
 +    <dependency>
++      <groupId>com.google.guava</groupId>
++      <artifactId>guava</artifactId>
++      <type>jar</type>
++      <version>19.0</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-resolver-provider</artifactId>
 +      <type>jar</type>
-+      <version>3.5.4</version>
++      <version>3.6.2</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.resolver</groupId>
 +      <artifactId>maven-resolver-api</artifactId>
 +      <type>jar</type>
-+      <version>1.1.1</version>
++      <version>1.4.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>javax.inject</groupId>
@@ -600,25 +640,19 @@
 +      <groupId>org.apache.maven.resolver</groupId>
 +      <artifactId>maven-resolver-impl</artifactId>
 +      <type>jar</type>
-+      <version>1.1.1</version>
++      <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-repository-metadata</artifactId>
 +      <type>jar</type>
-+      <version>3.5.4</version>
++      <version>3.6.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.resolver</groupId>
 +      <artifactId>maven-resolver-spi</artifactId>
 +      <type>jar</type>
-+      <version>1.1.1</version>
++      <version>1.4.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
@@ -630,25 +664,19 @@
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-model-builder</artifactId>
 +      <type>jar</type>
-+      <version>3.5.4</version>
++      <version>3.6.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-builder-support</artifactId>
 +      <type>jar</type>
-+      <version>3.5.4</version>
++      <version>3.6.2</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.maven.shared</groupId>
-+      <artifactId>maven-shared-utils</artifactId>
-+      <type>jar</type>
-+      <version>3.2.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-settings-builder</artifactId>
 +      <type>jar</type>
-+      <version>3.5.4</version>
++      <version>3.6.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.sonatype.plexus</groupId>
@@ -669,16 +697,28 @@
 +      <version>3.1.1</version>
 +    </dependency>
 +    <dependency>
++      <groupId>org.apache.maven.shared</groupId>
++      <artifactId>file-management</artifactId>
++      <type>jar</type>
++      <version>3.0.0</version>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven.shared</groupId>
++      <artifactId>maven-shared-io</artifactId>
++      <type>jar</type>
++      <version>3.0.0</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-archiver</artifactId>
 +      <type>jar</type>
-+      <version>3.2.0</version>
++      <version>3.5.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-interpolation</artifactId>
 +      <type>jar</type>
-+      <version>1.22</version>
++      <version>1.25</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-io</groupId>
@@ -687,22 +727,28 @@
 +      <version>2.5</version>
 +    </dependency>
 +    <dependency>
++      <groupId>org.apache.maven.shared</groupId>
++      <artifactId>maven-shared-utils</artifactId>
++      <type>jar</type>
++      <version>3.2.1</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-archiver</artifactId>
 +      <type>jar</type>
-+      <version>3.5</version>
++      <version>4.2.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-io</artifactId>
 +      <type>jar</type>
-+      <version>3.0.1</version>
++      <version>3.2.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
 +      <artifactId>commons-compress</artifactId>
 +      <type>jar</type>
-+      <version>1.16.1</version>
++      <version>1.19</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.tukaani</groupId>
@@ -714,7 +760,13 @@
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-utils</artifactId>
 +      <type>jar</type>
-+      <version>3.1.0</version>
++      <version>3.3.0</version>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven.wagon</groupId>
++      <artifactId>wagon-provider-api</artifactId>
++      <type>jar</type>
++      <version>3.3.3</version>
 +    </dependency>
 +  </dependencies>
 +</plugin>

maven-jar-plugin-build.xml

@@ -14,10 +14,10 @@
             value="Builds a Java Archive (JAR) file from the compiled project classes and resources."/>
   <property name="project.groupId" value="org.apache.maven.plugins"/>
   <property name="project.artifactId" value="maven-jar-plugin"/>
-  <property name="project.version" value="3.1.0"/>
+  <property name="project.version" value="3.2.0"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.1"/>
+  <property name="spec.version" value="3.2"/>
 
   <property name="compiler.source" value="1.6"/>
   <property name="compiler.target" value="${compiler.source}"/>

maven-jar-plugin.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov 25 17:28:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 3.2.0
+- Modified patch:
+  * maven-jar-plugin-bootstrap-resources.patch
+    + regenerate from non-bootstrap build
+
 -------------------------------------------------------------------
 Sun Nov 24 17:46:08 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

maven-jar-plugin.spec

@@ -23,7 +23,7 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-jar-plugin
-Version:        3.1.0
+Version:        3.2.0
 Release:        0
 Summary:        Maven JAR Plugin
 License:        Apache-2.0
@@ -35,11 +35,12 @@ Patch0:         %{base_name}-bootstrap-resources.patch
 Patch1:         01-allow-replacing-artifacts.patch
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
-BuildRequires:  maven-archiver
+BuildRequires:  maven-archiver >= 3.5.0
+BuildRequires:  maven-file-management
 BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
-BuildRequires:  plexus-archiver
+BuildRequires:  plexus-archiver >= 4.2.0
-BuildRequires:  plexus-utils
+BuildRequires:  plexus-utils >= 3.3.0
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildRequires:  xmvn-install
@@ -94,6 +95,7 @@ cp %{SOURCE1} build.xml
 %if %{with bootstrap}
 mkdir -p lib
 build-jar-repository -s lib \
+	maven-file-management/file-management \
 	maven-archiver/maven-archiver \
 	maven/maven-artifact \
 	maven/maven-core \