Dominique Leuenberger 2022-04-29 22:45:16 +00:00 committed by Git OBS Bridge
commit b2f6753d04
6 changed files with 178 additions and 107 deletions

View File

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

View File

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

View File

@ -1,6 +1,6 @@
--- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
+++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 2019-04-01 08:42:56.035739311 +0200
@@ -0,0 +1,493 @@
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+ <name>${project.name}</name>
@ -120,6 +120,14 @@
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>propertiesEncoding</name>
+ <type>java.lang.String</type>
+ <since>3.2.0</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>resources</name>
+ <type>java.util.List</type>
+ <required>true</required>
@ -282,6 +290,14 @@
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>propertiesEncoding</name>
+ <type>java.lang.String</type>
+ <since>3.2.0</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>skip</name>
+ <type>boolean</type>
+ <since>3.0.0</since>
@ -438,6 +454,14 @@
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>propertiesEncoding</name>
+ <type>java.lang.String</type>
+ <since>3.2.0</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>resources</name>
+ <type>java.util.List</type>
+ <required>true</required>
@ -496,7 +520,7 @@
+</plugin>
--- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
+++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 08:42:45.083685375 +0200
@@ -0,0 +1,830 @@
@@ -0,0 +1,866 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+ <name>${project.name}</name>
@ -633,6 +657,14 @@
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>propertiesEncoding</name>
+ <type>java.lang.String</type>
+ <since>3.2.0</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>resources</name>
+ <type>java.util.List</type>
+ <required>true</required>
@ -829,6 +861,14 @@
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>propertiesEncoding</name>
+ <type>java.lang.String</type>
+ <since>3.2.0</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>resources</name>
+ <type>java.util.List</type>
+ <required>true</required>
@ -1028,6 +1068,14 @@
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>propertiesEncoding</name>
+ <type>java.lang.String</type>
+ <since>3.2.0</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Copy resources of the configured plugin attribute resources</description>
+ </parameter>
+ <parameter>
+ <name>resources</name>
+ <type>java.util.List</type>
+ <required>true</required>
@ -1107,55 +1155,49 @@
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type>
+ <version>3.0</version>
+ <version>3.1.0</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.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <type>jar</type>
+ <version>0.3.3</version>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <type>jar</type>
+ <version>3.0</version>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ <version>3.8.1</version>
+ <version>1.7.32</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ <type>jar</type>
+ <version>0.3.3</version>
+ <version>0.3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
@ -1164,58 +1206,64 @@
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ <type>jar</type>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
+ <type>jar</type>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <type>jar</type>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <type>jar</type>
+ <version>4.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <type>jar</type>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <type>jar</type>
+ <version>20.0</version>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <type>jar</type>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <type>jar</type>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <type>jar</type>
+ <version>1.0</version>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ <version>5.0.3</version>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <type>jar</type>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
@ -1227,25 +1275,73 @@
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-named-locks</artifactId>
+ <type>jar</type>
+ <version>1.7.25</version>
+ <version>1.7.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <type>jar</type>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-spi</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ <type>jar</type>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId>
+ <type>jar</type>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <type>jar</type>
+ <version>3.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <type>jar</type>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-sec-dispatcher</artifactId>
+ <type>jar</type>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-cipher</artifactId>
+ <type>jar</type>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <type>jar</type>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
@ -1254,58 +1350,22 @@
+ <version>1.5.5</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.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId>
+ <type>jar</type>
+ <version>3.5.4</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>
+ </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.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <type>jar</type>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <artifactId>plexus-interpolation</artifactId>
+ <type>jar</type>
+ <version>3.1.0</version>
+ <version>1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <type>jar</type>
+ <version>0.0.0.M2a</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <type>jar</type>
+ <version>3.1.1</version>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
@ -1317,13 +1377,13 @@
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <version>2.5</version>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <type>jar</type>
+ <version>1.24</version>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+</plugin>

View File

@ -13,16 +13,16 @@
<property name="project.description"
value="The Resources Plugin handles the copying of project resources to the output
directory. There are two different kinds of resources: main resources and test resources. The
difference is that the main resources are the resources associated to the main
source code while the test resources are associated to the test source code.
difference is that the main resources are the resources associated with the main
source code while the test resources are associated with the test source code.
Thus, this allows the separation of resources for the main source code and its
unit tests."/>
<property name="project.groupId" value="org.apache.maven.plugins"/>
<property name="project.artifactId" value="maven-resources-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.8"/>
<property name="compiler.target" value="${compiler.source}"/>

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Apr 28 11:51:20 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 3.2.0
- Modified patch:
* maven-resources-plugin-bootstrap-resources.patch
+ regenerate with current version of tools against the current
version of package
-------------------------------------------------------------------
Tue Mar 22 13:44:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -23,7 +23,7 @@
%bcond_with bootstrap
%endif
%global base_name maven-resources-plugin
Version: 3.1.0
Version: 3.2.0
Release: 0
Summary: Maven Resources Plugin
License: Apache-2.0
@ -33,10 +33,11 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_n
Source1: %{base_name}-build.xml
Patch0: %{base_name}-bootstrap-resources.patch
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: maven-filtering
BuildRequires: maven-filtering >= 1.3
BuildRequires: maven-lib
BuildRequires: maven-plugin-annotations
BuildRequires: plexus-interpolation
@ -94,6 +95,7 @@ cp %{SOURCE1} build.xml
mkdir -p lib
build-jar-repository -s lib \
commons-io \
commons-lang3 \
maven-filtering/maven-filtering \
maven/maven-core \
maven/maven-model \