You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/09/20 12:59:30 UTC
(maven-site-plugin) branch master updated (048a0603 -> 00bf8ace)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
from 048a0603 Port the IT scripts from BeanShell to Groovy
new acb62cdf Bump Maven from 3.6.3 to 3.9.16
new 00bf8ace Read the expected download version from the IT POM
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 | 23 ++++++++++++++++++++---
src/it/projects/MSITE-609/verify.groovy | 9 +++++++--
src/it/projects/site-deploy/verify.groovy | 9 +++++++--
3 files changed, 34 insertions(+), 7 deletions(-)
(maven-site-plugin) 01/02: Bump Maven from 3.6.3 to 3.9.16
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit acb62cdf5fafc8bb139bda7329935d7ed10a7d04
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 11:05:22 2026 +0200
Bump Maven from 3.6.3 to 3.9.16
transport-wagon and the resolver api/util that maven-reporting-exec 2.0.1 still pulls at 1.4.1 are pinned to 1.9.27, the resolver that Maven 3.9.16 ships; mixing the two resolver lines on the test classpath fails DefaultRepositorySystem wiring. The pin can go once maven-reporting-exec 2.1.0 is in.
---
pom.xml | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 354cacc8..d9df35e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,9 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <mavenVersion>3.6.3</mavenVersion>
+ <mavenVersion>3.9.16</mavenVersion>
+ <!-- resolver shipping with ${mavenVersion} -->
+ <resolverVersion>1.9.27</resolverVersion>
<!-- for dependencies -->
<doxiaVersion>2.1.0</doxiaVersion>
<doxiaSitetoolsVersion>2.1.0</doxiaSitetoolsVersion>
@@ -210,6 +212,22 @@ under the License.
<project.build.outputTimestamp>2026-05-20T15:10:39Z</project.build.outputTimestamp>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <!-- maven-reporting-exec 2.0.1 still pulls the Maven 3.6.3 resolver; keep one resolver version on the classpath -->
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <version>${resolverVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>${resolverVersion}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -274,8 +292,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-wagon</artifactId>
- <version>1.4.1</version>
- <!-- version shipping with Maven 3.6.3-->
+ <version>${resolverVersion}</version>
<scope>compile</scope>
</dependency>
(maven-site-plugin) 02/02: Read the expected download version from the IT POM
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 00bf8ace9c00fc05f4f1f22ff8670338e1720460
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 11:26:34 2026 +0200
Read the expected download version from the IT POM
The MSITE-609 and site-deploy verify scripts asserted the literal
"Download Maven 3.6.3", which the IT POMs set from @mavenVersion@.
---
src/it/projects/MSITE-609/verify.groovy | 9 +++++++--
src/it/projects/site-deploy/verify.groovy | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/it/projects/MSITE-609/verify.groovy b/src/it/projects/MSITE-609/verify.groovy
index 2b4715e5..7bcfa58e 100644
--- a/src/it/projects/MSITE-609/verify.groovy
+++ b/src/it/projects/MSITE-609/verify.groovy
@@ -64,11 +64,16 @@ try
System.err.println( "download.html file is missing or a directory." );
return false;
}
+ // the page interpolates ${currentVersion}, which the filtered POM sets from @mavenVersion@
+ String pomContent = FileUtils.fileRead( new File( basedir, "pom.xml" ), "UTF-8" );
+ int start = pomContent.indexOf( "<currentVersion>" ) + "<currentVersion>".length();
+ String currentVersion = pomContent.substring( start, pomContent.indexOf( "</currentVersion>", start ) );
+ String expected = "Download Maven " + currentVersion;
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
- int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" );
+ int indexOf = downloadContent.indexOf( expected );
if ( indexOf < 0 )
{
- System.err.println( "download.html doesn't contain Download Maven 3.6.3" );
+ System.err.println( "download.html doesn't contain " + expected );
return false;
}
}
diff --git a/src/it/projects/site-deploy/verify.groovy b/src/it/projects/site-deploy/verify.groovy
index 2b4715e5..7bcfa58e 100644
--- a/src/it/projects/site-deploy/verify.groovy
+++ b/src/it/projects/site-deploy/verify.groovy
@@ -64,11 +64,16 @@ try
System.err.println( "download.html file is missing or a directory." );
return false;
}
+ // the page interpolates ${currentVersion}, which the filtered POM sets from @mavenVersion@
+ String pomContent = FileUtils.fileRead( new File( basedir, "pom.xml" ), "UTF-8" );
+ int start = pomContent.indexOf( "<currentVersion>" ) + "<currentVersion>".length();
+ String currentVersion = pomContent.substring( start, pomContent.indexOf( "</currentVersion>", start ) );
+ String expected = "Download Maven " + currentVersion;
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
- int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" );
+ int indexOf = downloadContent.indexOf( expected );
if ( indexOf < 0 )
{
- System.err.println( "download.html doesn't contain Download Maven 3.6.3" );
+ System.err.println( "download.html doesn't contain " + expected );
return false;
}
}