Fridrich Strba 2022-04-27 05:18:34 +00:00 committed by Git OBS Bridge
parent c8dd10d940
commit eaf5c7f1de
5 changed files with 105 additions and 167 deletions

View File

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

View File

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

View File

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

View File

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