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 17:24:05 UTC
[maven-site-plugin] branch maven-3.2.5 updated (da9af586 -> 242e6373)
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
omit da9af586 Fix test
omit 9b379ece Upgrade to maven 3.2.5 + Java8
add 6c53dfc1 Shared GitHub actions v2
add 0b1c775f [MSITE-829] [MSITE-828] Upgrade Jetty to 9.4.x implicit java8 requirement now (#21)
add 0d5299be Enable release drafter (#75)
add 13787944 Bump mrm-maven-plugin from 1.2.0 to 1.3.0
add af097dce Bump slf4jVersion from 1.7.32 to 1.7.36
new cb1a10e6 Upgrade to maven 3.2.5 + Java8
new 242e6373 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 (da9af586)
\
N -- N -- N refs/heads/maven-3.2.5 (242e6373)
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:
.../release-drafter.yml | 5 +++--
.github/workflows/maven-verify.yml | 6 +-----
.../{maven-verify.yml => release-drafter.yml} | 20 ++++++++------------
Jenkinsfile | 2 +-
pom.xml | 10 ++++++----
src/it/projects/MSITE-497/pom.xml | 1 +
6 files changed, 20 insertions(+), 24 deletions(-)
copy src/it/projects/MSITE-609/invoker.properties => .github/release-drafter.yml (84%)
copy .github/workflows/{maven-verify.yml => release-drafter.yml} (81%)
[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 242e637340278a9284396444a3c23b1c6bb3100b
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Feb 22 16:42:30 2022 +0100
Fix test
---
.../java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 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..c275d4d5 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;
[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 cb1a10e6df9da8556585b1ef78f159de3835fd01
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Feb 22 16:39:45 2022 +0100
Upgrade to maven 3.2.5 + Java8
---
pom.xml | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 338988d8..5414fa14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,17 +195,15 @@ 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>
<jettyVersion>9.4.44.v20210927</jettyVersion>
-
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
- <wagonVersion>3.3.1</wagonVersion>
+ <wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
@@ -255,6 +253,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>
@@ -321,7 +325,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 -->
@@ -404,6 +408,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 -->
@@ -489,20 +499,20 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
</dependency>
<!-- test -->
<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>