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 2024/08/15 10:05:28 UTC
(maven-deploy-plugin) branch maven-deploy-plugin-3.x updated: [MDEPLOY-322] Use parent POM 43 (#74)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-deploy-plugin-3.x
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
The following commit(s) were added to refs/heads/maven-deploy-plugin-3.x by this push:
new c814011 [MDEPLOY-322] Use parent POM 43 (#74)
c814011 is described below
commit c814011f235b00c83b37f21cd03c4be5713855fb
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Aug 15 12:05:24 2024 +0200
[MDEPLOY-322] Use parent POM 43 (#74)
Also, some ITs were not updated with latest changes and failed.
Unsure where were they before this change?
---
https://issues.apache.org/jira/browse/MDEPLOY-322
---
pom.xml | 21 ++++-----------------
src/it/no-main-artifact-1/verify.groovy | 2 +-
src/it/no-main-artifact-2/verify.groovy | 2 +-
.../apache/maven/plugins/deploy/DeployFileMojo.java | 2 ++
.../org/apache/maven/plugins/deploy/DeployMojo.java | 1 +
5 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 72dfbfe..dc0c27d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>42</version>
+ <version>43</version>
<relativePath />
</parent>
@@ -70,10 +70,10 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.9.6</mavenVersion>
- <!-- Keep in sync with resolver used in maven above -->
+ <!-- Maven bound -->
+ <resolverVersion>1.9.18</resolverVersion>
+ <!-- Maven bound -->
<slf4jVersion>1.7.36</slf4jVersion>
- <!-- Keep in sync with resolver used in maven above -->
- <resolverVersion>1.9.20</resolverVersion>
<!-- plugins version used in IT tests -->
<mavenAntrunPluginVersion>${version.maven-antrun-plugin}</mavenAntrunPluginVersion>
@@ -210,19 +210,6 @@ under the License.
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <proc>none</proc>
- <showDeprecation>true</showDeprecation>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>run-its</id>
diff --git a/src/it/no-main-artifact-1/verify.groovy b/src/it/no-main-artifact-1/verify.groovy
index 9442aa7..7274ba5 100644
--- a/src/it/no-main-artifact-1/verify.groovy
+++ b/src/it/no-main-artifact-1/verify.groovy
@@ -19,5 +19,5 @@
def buildLog = new File ( basedir, "build.log")
-assert buildLog.text.contains( "The packaging plugin for this project did not assign "
+assert buildLog.text.contains( "The packaging plugin for project test did not assign "
+ "a main file to the project but it has attachments. Change packaging to 'pom'." )
\ No newline at end of file
diff --git a/src/it/no-main-artifact-2/verify.groovy b/src/it/no-main-artifact-2/verify.groovy
index 9442aa7..7274ba5 100644
--- a/src/it/no-main-artifact-2/verify.groovy
+++ b/src/it/no-main-artifact-2/verify.groovy
@@ -19,5 +19,5 @@
def buildLog = new File ( basedir, "build.log")
-assert buildLog.text.contains( "The packaging plugin for this project did not assign "
+assert buildLog.text.contains( "The packaging plugin for project test did not assign "
+ "a main file to the project but it has attachments. Change packaging to 'pom'." )
\ No newline at end of file
diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
index 7e6536f..66bf21f 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
@@ -229,6 +229,8 @@ public class DeployFileMojo extends AbstractDeployMojo {
}
}
+ @Override
+ @SuppressWarnings("MethodLength")
public void execute() throws MojoExecutionException, MojoFailureException {
if (Boolean.parseBoolean(skip)
|| ("releases".equals(skip) && !ArtifactUtils.isSnapshot(version))
diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
index 79ee1d8..2c58661 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
@@ -180,6 +180,7 @@ public class DeployMojo extends AbstractDeployMojo {
return pluginContext.containsKey(DEPLOY_PROCESSED_MARKER);
}
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
State state;
if (Boolean.parseBoolean(skip)