rpm/maven-resources-plugin
SHA256
1
0
Fork 0
forked from pool/maven-resources-plugin
Code Pull Requests Activity

Accepting request 1112450 from Java:packages

Browse Source 
3.3.1

OBS-URL: https://build.opensuse.org/request/show/1112450
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-resources-plugin?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2023-09-20 11:31:29 +00:00 committed by Git OBS Bridge
commit c08bfee102
6 changed files with 182 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-resources-plugin-3.2.0-source-release.zip
View File

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

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

Binary file not shown.

336
maven-resources-plugin-bootstrap-resources.patch
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,517 @@
--- maven-resources-plugin-3.3.1/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.3.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 2023-09-14 08:28:18.322786139 +0200
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+ <name>${project.name}</name>
@ -181,6 +181,62 @@
+ </configuration>
+ </mojo>
+ <mojo>
+ <goal>help</goal>
+ <description>Display help information on maven-resources-plugin.
+Call mvn resources:help -Ddetail=true -Dgoal=&lt;goal-name&gt; to display parameter details.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>false</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <implementation>org.apache.maven.plugins.resources.HelpMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <threadSafe>true</threadSafe>
+ <parameters>
+ <parameter>
+ <name>detail</name>
+ <type>boolean</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.
+Call mvn resources:help -Ddetail=true -Dgoal=&lt;goal-name&gt; to display parameter details.</description>
+ </parameter>
+ <parameter>
+ <name>goal</name>
+ <type>java.lang.String</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.
+Call mvn resources:help -Ddetail=true -Dgoal=&lt;goal-name&gt; to display parameter details.</description>
+ </parameter>
+ <parameter>
+ <name>indentSize</name>
+ <type>int</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.
+Call mvn resources:help -Ddetail=true -Dgoal=&lt;goal-name&gt; to display parameter details.</description>
+ </parameter>
+ <parameter>
+ <name>lineLength</name>
+ <type>int</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.
+Call mvn resources:help -Ddetail=true -Dgoal=&lt;goal-name&gt; to display parameter details.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <detail implementation="boolean" default-value="false">${detail}</detail>
+ <goal implementation="java.lang.String">${goal}</goal>
+ <indentSize implementation="int" default-value="2">${indentSize}</indentSize>
+ <lineLength implementation="int" default-value="80">${lineLength}</lineLength>
+ </configuration>
+ </mojo>
+ <mojo>
+ <goal>resources</goal>
+ <description>Copy resources for the main source code to the main output directory. Always uses the project.build.resources element to specify the resources to copy.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
@ -518,9 +574,9 @@
+ </mojo>
+ </mojos>
+</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,866 @@
--- maven-resources-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
+++ maven-resources-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/plugin.xml 2023-09-14 08:30:05.500192926 +0200
@@ -0,0 +1,748 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+ <name>${project.name}</name>
@ -732,9 +788,69 @@
+ <role-hint>default</role-hint>
+ <field-name>mavenResourcesFiltering</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.shared.filtering.MavenResourcesFiltering</role>
+ <field-name>mavenResourcesFilteringMap</field-name>
+ </requirement>
+ </requirements>
+ </mojo>
+ <mojo>
+ <goal>help</goal>
+ <description>Display help information on maven-resources-plugin.&lt;br&gt;
+Call &lt;code&gt;mvn resources:help -Ddetail=true -Dgoal=&amp;lt;goal-name&amp;gt;&lt;/code&gt; to display parameter details.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>false</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <implementation>org.apache.maven.plugins.resources.HelpMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <threadSafe>true</threadSafe>
+ <parameters>
+ <parameter>
+ <name>detail</name>
+ <type>boolean</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.&lt;br&gt;
+Call &lt;code&gt;mvn resources:help -Ddetail=true -Dgoal=&amp;lt;goal-name&amp;gt;&lt;/code&gt; to display parameter details.</description>
+ </parameter>
+ <parameter>
+ <name>goal</name>
+ <type>java.lang.String</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.&lt;br&gt;
+Call &lt;code&gt;mvn resources:help -Ddetail=true -Dgoal=&amp;lt;goal-name&amp;gt;&lt;/code&gt; to display parameter details.</description>
+ </parameter>
+ <parameter>
+ <name>indentSize</name>
+ <type>int</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.&lt;br&gt;
+Call &lt;code&gt;mvn resources:help -Ddetail=true -Dgoal=&amp;lt;goal-name&amp;gt;&lt;/code&gt; to display parameter details.</description>
+ </parameter>
+ <parameter>
+ <name>lineLength</name>
+ <type>int</type>
+ <required>false</required>
+ <editable>true</editable>
+ <description>Display help information on maven-resources-plugin.&lt;br&gt;
+Call &lt;code&gt;mvn resources:help -Ddetail=true -Dgoal=&amp;lt;goal-name&amp;gt;&lt;/code&gt; to display parameter details.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <detail implementation="boolean" default-value="false">${detail}</detail>
+ <goal implementation="java.lang.String">${goal}</goal>
+ <indentSize implementation="int" default-value="2">${indentSize}</indentSize>
+ <lineLength implementation="int" default-value="80">${lineLength}</lineLength>
+ </configuration>
+ </mojo>
+ <mojo>
+ <goal>resources</goal>
+ <description>Copy resources for the main source code to the main output directory. Always uses the project.build.resources element
+to specify the resources to copy.</description>
@ -939,6 +1055,10 @@
+ <role-hint>default</role-hint>
+ <field-name>mavenResourcesFiltering</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.shared.filtering.MavenResourcesFiltering</role>
+ <field-name>mavenResourcesFilteringMap</field-name>
+ </requirement>
+ </requirements>
+ </mojo>
+ <mojo>
@ -1147,123 +1267,19 @@
+ <role-hint>default</role-hint>
+ <field-name>mavenResourcesFiltering</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.shared.filtering.MavenResourcesFiltering</role>
+ <field-name>mavenResourcesFilteringMap</field-name>
+ </requirement>
+ </requirements>
+ </mojo>
+ </mojos>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <type>jar</type>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <type>jar</type>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <type>jar</type>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <type>jar</type>
+ <version>3.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <type>jar</type>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ <version>1.7.32</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ <type>jar</type>
+ <version>0.3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <type>jar</type>
+ <version>1.1</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>any</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <type>jar</type>
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ <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.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <type>jar</type>
+ <version>1.6.3</version>
+ <version>1.7.36</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
@ -1272,100 +1288,22 @@
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <type>jar</type>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-named-locks</artifactId>
+ <type>jar</type>
+ <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.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-spi</artifactId>
+ <type>jar</type>
+ <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>
+ <artifactId>plexus-component-annotations</artifactId>
+ <type>jar</type>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <type>jar</type>
+ <version>1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <type>jar</type>
+ <version>0.0.0.M2a</version>
+ <version>3.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <type>jar</type>
+ <version>3.2.0</version>
+ <version>3.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
@ -1377,13 +1315,13 @@
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <version>2.6</version>
+ <version>2.11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <type>jar</type>
+ <version>3.8.1</version>
+ <version>3.12.0</version>
+ </dependency>
+ </dependencies>
+</plugin>

4
maven-resources-plugin-build.xml
View File

@ -19,10 +19,10 @@
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.2.0"/>
<property name="project.version" value="3.3.1"/>
<property name="project.organization.name" value="The Apache Software Foundation"/>
<property name="spec.version" value="3.2"/>
<property name="spec.version" value="3.3"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>

38
maven-resources-plugin.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Wed Sep 20 06:06:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 3.3.1
* Bug
+ MRESOURCES-237: Resource plugin's handling of symbolic links
changed in 3.0.x, broke existing behavior
+ MRESOURCES-265: Resource copying not using specified encoding
+ MRESOURCES-268: java.nio.charset.MalformedInputException:
Input length = 1
+ MRESOURCES-273: Filtering of Maven properties with long names
is not working after transition from 2.6 to 3.2.0
+ MRESOURCES-275: valid location for directory parameter is
always required
+ MRESOURCES-269: Symlinks cause copying resources to fail
+ MRESOURCES-289: FileUtils.copyFile() fails with source file
having lastModified = 0
* New Feature
+ MRESOURCES-250: Add ability to flatten folder structure into
target directory when copying resources
* Improvement
+ MRESOURCES-288: make tests jar reproducible
+ MRESOURCES-292: describe from and to in "Copying x
resources" info message
* Task
+ MRESOURCES-295: Drop plexus legacy
+ MRESOURCES-297: Update to parent POM 39, reformat sources
+ MRESOURCES-277: Update plugin (requires Maven 3.2.5+)
+ MRESOURCES-283: Require Java 8
* Dependency upgrade
+ MRESOURCES-282: Upgrade maven-plugin parent to 36
+ MRESOURCES-286: Upgrade Maven Filtering to 3.3.0
+ MRESOURCES-294: Upgrade plexus-utils to 3.5.1
+ MRESOURCES-296: Upgrade to maven-filtering 3.3.1
- Modified patch:
* maven-resources-plugin-bootstrap-resources.patch
+ regenerate in cycle
-------------------------------------------------------------------
Fri Jun 24 09:44:50 UTC 2022 - Fridrich Strba <fstrba@suse.com>

6
maven-resources-plugin.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,7 +23,7 @@
%bcond_with bootstrap
%endif
%global base_name maven-resources-plugin
Version: 3.2.0
Version: 3.3.1
Release: 0
Summary: Maven Resources Plugin
License: Apache-2.0
@ -32,7 +32,6 @@ URL: https://maven.apache.org/plugins/maven-resources-plugin
Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
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
@ -96,7 +95,6 @@ cp %{SOURCE1} build.xml
%if %{with bootstrap}
mkdir -p lib
build-jar-repository -s lib \
commons-io \
commons-lang3 \
maven-filtering/maven-filtering \
maven/maven-core \