[MDEPLOY-322] Use parent POM 43

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
apache · Aug 15, 2024 · ed38de3 · ed38de3
1 parent 23cdae6
commit ed38de3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git 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
@@ -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'." )
diff --git 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'." )
diff --git 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 @@ void initProperties() throws MojoExecutionException {
         }
     }
 
+    @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
@@ -180,6 +180,7 @@ private boolean hasState(MavenProject project) {
         return pluginContext.containsKey(DEPLOY_PROCESSED_MARKER);
     }
 
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         State state;
         if (Boolean.parseBoolean(skip)