[MSITE-888] Upgrade to Maven 3.2.5

This closes #73
apache · Apr 16, 2022 · 32be6ad · 32be6ad
1 parent bf434e5
commit 32be6ad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -195,7 +195,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenVersion>3.0.5</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
     <javaVersion>8</javaVersion>
 
     <!-- for dependencies -->
@@ -252,6 +252,12 @@ under the License.
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-aether-provider</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
@@ -401,6 +407,12 @@ under the License.
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-integration-tools</artifactId>
       <version>${doxiaSitetoolsVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Wagon -->
@@ -501,7 +513,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>2.1</version>
+      <version>3.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
@@ -21,7 +21,7 @@
 
 import org.apache.maven.artifact.manager.WagonManager;
 //import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,7 +32,7 @@
  */
 @RunWith( JUnit4.class )
 public class SiteDeployMojoTest
-    extends PlexusTestCase
+    extends AbstractMojoTestCase
 {
     private WagonManager wagonManager;
 
@@ -102,7 +102,7 @@ public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts1()
     public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts2()
     {
         wagonManager.
-        
+
         wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "*mycompany" );
         ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
         assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );