You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/07/13 11:48:02 UTC
[maven-remote-resources-plugin] branch MRRESOURCES-119 created (now ff30673)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch MRRESOURCES-119
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
at ff30673 [MRRESOURCES-119] Update plugin to 3.x
This branch includes the following new commits:
new ff30673 [MRRESOURCES-119] Update plugin to 3.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-remote-resources-plugin] 01/01: [MRRESOURCES-119] Update plugin to 3.x
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MRRESOURCES-119
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit ff30673aecae62992a894eb998cf73ca6d440e9f
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Jul 13 13:47:07 2022 +0200
[MRRESOURCES-119] Update plugin to 3.x
Changes:
* parent POM 36
* set proper scopes for maven bits
* update deps
* keep Java7 level
* this is first 3.x release of this plugin
---
pom.xml | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a35ef2..915be73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>34</version>
+ <version>36</version>
<relativePath />
</parent>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Remote Resources Plugin</name>
@@ -68,10 +68,8 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
<javaVersion>7</javaVersion>
- <mavenFilteringVersion>3.1.1</mavenFilteringVersion>
- <sitePluginVersion>3.3</sitePluginVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -81,21 +79,31 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -123,7 +131,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>${mavenFilteringVersion}</version>
+ <version>3.2.0</version>
</dependency>
<!-- plexus -->
@@ -137,7 +145,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -149,19 +157,19 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.1.0</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.7.2</version>
+ <version>1.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -322,6 +330,7 @@ under the License.
<filtering>true</filtering>
<excludes>
<exclude>custom-filter-delim/src/main/resources/**</exclude>
+ <exclude>**/*.jar</exclude> <!-- maven-filtering chokes on JARs -->
</excludes>
</testResource>
<testResource>
@@ -329,6 +338,7 @@ under the License.
<filtering>false</filtering>
<includes>
<include>custom-filter-delim/src/main/resources/**</include>
+ <include>**/*.jar</include> <!-- maven-filtering chokes on JARs -->
</includes>
</testResource>
</testResources>