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 19:20:14 UTC
[maven-site-plugin] branch maven-3.2.5 updated (a7be5b41 -> c965c21f)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
discard a7be5b41 Fix test
discard cb1a10e6 Upgrade to maven 3.2.5 + Java8
add 8382743c [MSITE-884] Drop/replace usage of Commons Lang 3
add 628f5b3a [MSITE-885] Upgrade Commons IO to 2.11.0
add 7a3ed19c [MSITE-886] Upgrade Maven Wagon to 3.5.1
add 73df7bb9 Remove unused properties
add 6c42df38 Add undeclared dependency
add d1bfb429 [MSITE-887] Deprecate templateFile parameter
new 7794b991 Upgrade to maven 3.2.5 + Java8
new c965c21f Fix test
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 (a7be5b41)
\
N -- N -- N refs/heads/maven-3.2.5 (c965c21f)
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 2 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:
pom.xml | 16 ++++++++--------
.../maven/plugins/site/deploy/AbstractStagingMojo.java | 2 +-
.../maven/plugins/site/deploy/SiteStageDeployMojo.java | 2 +-
.../maven/plugins/site/descriptor/EffectiveSiteMojo.java | 5 +----
.../plugins/site/render/AbstractSiteRenderingMojo.java | 2 ++
.../apache/maven/plugins/site/deploy/HttpRequest.java | 8 +++-----
6 files changed, 16 insertions(+), 19 deletions(-)
[maven-site-plugin] 02/02: Fix test
Posted by mi...@apache.org.
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 c965c21fbbb8f1182d40c23a622284ea809085e0
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Feb 22 16:42:30 2022 +0100
Fix test
---
.../org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 );
[maven-site-plugin] 01/02: Upgrade to maven 3.2.5 + Java8
Posted by mi...@apache.org.
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 7794b9914bda257e5f9dec0cc6857a7c010f952f
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Feb 22 16:39:45 2022 +0100
Upgrade to maven 3.2.5 + Java8
---
pom.xml | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ece8805a..bbc65082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,9 +195,8 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.0.5</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
-
<!-- for dependencies -->
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
@@ -252,6 +251,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>
@@ -318,7 +323,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
+ <version>3.4.1</version>
</dependency>
<!-- Doxia -->
@@ -401,6 +406,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 +512,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>