You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/04/27 19:15:04 UTC
[maven-resources-plugin] branch MRESOURCES-282 updated (979ceeb -> b8d4532)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MRESOURCES-282
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
discard 979ceeb [MRESOURCES-282] - Upgrade maven-plugin parent to 35
add ad4b2ad [MRESOURCES-283] Require Java 8 and upgrade deps
add 2fe1e8c [MRESOURCES-277] Update plugin (requires Maven 3.2.5+)
new a954660 Bump to 3.3.0-SNAPSHOT
new b8d4532 [MRESOURCES-282] Bump parent-pom from 34 to 36
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (979ceeb)
\
N -- N -- N refs/heads/MRESOURCES-282 (b8d4532)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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.
Summary of changes:
pom.xml | 52 ++++++++++------------
.../maven/plugins/resources/ResourcesMojo.java | 6 +--
.../resources/AbstractPropertyUtilsTest.java | 3 +-
.../maven/plugins/resources/ResourcesMojoTest.java | 20 +++------
.../maven/plugins/resources/filters/ItFilter.java | 4 +-
.../resources/stub/MavenProjectBasicStub.java | 1 -
.../resources/stub/MavenProjectBuildStub.java | 6 +--
.../resources/stub/MavenProjectResourcesStub.java | 18 ++++----
8 files changed, 50 insertions(+), 60 deletions(-)
[maven-resources-plugin] 01/02: Bump to 3.3.0-SNAPSHOT
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MRESOURCES-282
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
commit a9546600a12bc19a27a9943fd5b0e6ec28681d0f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 27 21:09:51 2022 +0200
Bump to 3.3.0-SNAPSHOT
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d8cd6f7..537d207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
</parent>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Resources Plugin</name>
[maven-resources-plugin] 02/02: [MRESOURCES-282] Bump parent-pom from 34 to 36
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MRESOURCES-282
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
commit b8d453263d6bb8a5872db403b438aa52dce5d8d9
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 27 21:11:50 2022 +0200
[MRESOURCES-282] Bump parent-pom from 34 to 36
---
pom.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 537d207..f6b3dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>34</version>
+ <version>36</version>
</parent>
<artifactId>maven-resources-plugin</artifactId>
@@ -100,6 +100,12 @@ under the License.
<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>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@@ -219,6 +225,7 @@ under the License.
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<goals>