You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/16 20:39:57 UTC
[maven-site-plugin] 01/01: [MSITE-888] Upgrade to Maven 3.2.5
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 32be6ad8b99916dec6f908484f2d690044bf0b47
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Feb 22 16:39:45 2022 +0100
[MSITE-888] Upgrade to Maven 3.2.5
This closes #73
---
pom.xml | 16 ++++++++++++++--
.../maven/plugins/site/deploy/SiteDeployMojoTest.java | 6 +++---
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 27cc1546..a7f64ae9 100644
--- 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
index 59f41b44..c512ef03 100644
--- 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 @@ package org.apache.maven.plugins.site.deploy;
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 @@ import org.junit.runners.JUnit4;
*/
@RunWith( JUnit4.class )
public class SiteDeployMojoTest
- extends PlexusTestCase
+ extends AbstractMojoTestCase
{
private WagonManager wagonManager;
@@ -102,7 +102,7 @@ public class SiteDeployMojoTest
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 );