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 18:49:55 UTC
[maven-resources-plugin] branch MRESOURCES-277 updated (e24e519 -> 965ac77)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MRESOURCES-277
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
discard e24e519 [MRESOURCES-277] Bump maven-plugins from 34 to 36
new 965ac77 [MRESOURCES-277] Update plugin (requires Maven 3.2.5+)
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 (e24e519)
\
N -- N -- N refs/heads/MRESOURCES-277 (965ac77)
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 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.
Summary of changes:
[maven-resources-plugin] 01/01: [MRESOURCES-277] Update plugin (requires Maven 3.2.5+)
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MRESOURCES-277
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
commit 965ac77501c8bd7d3b95c1ce333adbe97acab51d
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Mon Oct 11 13:24:37 2021 +0200
[MRESOURCES-277] Update plugin (requires Maven 3.2.5+)
---
pom.xml | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26065c8..d8cd6f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@ under the License.
<properties>
<mavenFilteringVersion>3.2.0</mavenFilteringVersion>
- <mavenVersion>3.1.0</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-08-05T15:25:21Z</project.build.outputTimestamp>
</properties>
@@ -86,16 +86,19 @@ under the License.
<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-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.plugin-tools</groupId>
@@ -105,6 +108,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -115,7 +119,8 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.0.0.M2a</version>
+ <version>0.3.5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -145,7 +150,7 @@ under the License.
<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>
@@ -161,30 +166,14 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>0.9.0.M2</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <version>1.6.3</version>
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- remove with next parent upgrade MPOM-269 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <tagletArtifacts combine.self="override"/>
- <detectLinks>false</detectLinks>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<profiles>
<profile>
<id>run-its</id>