This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-1008
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 03641a2986c7241501b735c5a62aed42e8f321da
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun May 19 20:23:02 2024 +0200
[MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
This closes #187
---
Jenkinsfile | 2 +-
pom.xml | 7 +++---
src/it/projects/MSITE-609/verify.bsh | 4 ++--
src/it/projects/MSITE-627/pom.xml | 12 +++++++++++
.../java/org/apache/maven/plugins/it/MyReport.java | 25 +++-------------------
src/it/projects/MSITE-842/project/pom.xml | 12 +++++++++++
.../java/org/apache/maven/plugins/it/MyReport.java | 6 +++---
src/it/projects/full-reporting/pom.xml | 2 +-
src/it/projects/site-deploy/verify.bsh | 4 ++--
.../site/deploy/AbstractSiteDeployWebDavTest.java | 4 +++-
10 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a39af828..02ccc0c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.2.x', '3.5.x', '3.6.x',
'3.8.x', '3.9.x'])
+asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.6.x', '3.8.x', '3.9.x'])
diff --git a/pom.xml b/pom.xml
index 2ea5d662..9f115ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>41</version>
+ <version>42</version>
<relativePath />
</parent>
@@ -193,9 +193,8 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
- <minimalMavenBuildVersion>${mavenVersion}</minimalMavenBuildVersion>
<javaVersion>8</javaVersion>
+ <mavenVersion>3.6.3</mavenVersion>
<!-- for dependencies -->
<jettyVersion>9.4.54.v20240208</jettyVersion>
<doxiaVersion>2.0.0-M10</doxiaVersion>
@@ -254,7 +253,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
+ <artifactId>maven-resolver-provider</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
diff --git a/src/it/projects/MSITE-609/verify.bsh
b/src/it/projects/MSITE-609/verify.bsh
index 5fdf251a..2b4715e5 100644
--- a/src/it/projects/MSITE-609/verify.bsh
+++ b/src/it/projects/MSITE-609/verify.bsh
@@ -65,10 +65,10 @@ try
return false;
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
- int indexOf = downloadContent.indexOf( "Download Maven 3.2.5" );
+ int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" );
if ( indexOf < 0 )
{
- System.err.println( "download.html doesn't contain Download Maven
3.2.5" );
+ System.err.println( "download.html doesn't contain Download Maven
3.6.3" );
return false;
}
}
diff --git a/src/it/projects/MSITE-627/pom.xml
b/src/it/projects/MSITE-627/pom.xml
index 65054be5..e24f9880 100644
--- a/src/it/projects/MSITE-627/pom.xml
+++ b/src/it/projects/MSITE-627/pom.xml
@@ -41,6 +41,18 @@ under the License.
<artifactId>maven-reporting-impl</artifactId>
<version>@mavenReportingImplVersion@</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>@mavenVersion@</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>@mavenPluginPluginVersion@</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
index dcf40e98..19cd83bf 100644
---
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
+++
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -23,7 +23,8 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.sink.impl.SinkAdapter;
import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.project.MavenProject;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -31,10 +32,8 @@ import java.util.Locale;
/**
* Goal which creates a sink in a report.
- *
- * @goal test
- * @phase site
*/
+@Mojo( name = "test", defaultPhase = LifecyclePhase.SITE )
public class MyReport
extends AbstractMavenReport
{
@@ -54,24 +53,6 @@ public class MyReport
return "Test Report for MSITE-672";
}
- @Override
- protected Renderer getSiteRenderer()
- {
- return null;
- }
-
- @Override
- protected String getOutputDirectory()
- {
- return null;
- }
-
- @Override
- protected MavenProject getProject()
- {
- return null;
- }
-
@Override
protected void executeReport( Locale locale )
throws MavenReportException
diff --git a/src/it/projects/MSITE-842/project/pom.xml
b/src/it/projects/MSITE-842/project/pom.xml
index 874ec37e..783d6fa8 100644
--- a/src/it/projects/MSITE-842/project/pom.xml
+++ b/src/it/projects/MSITE-842/project/pom.xml
@@ -42,6 +42,18 @@ under the License.
<artifactId>maven-reporting-impl</artifactId>
<version>@mavenReportingImplVersion@</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>@mavenVersion@</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>@mavenPluginPluginVersion@</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java
b/src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java
index 7044cca5..b16dc286 100644
---
a/src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java
+++
b/src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -20,6 +20,8 @@ package org.apache.maven.plugins.it;
*/
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -29,10 +31,8 @@ import java.util.Locale;
/**
* Goal which creates several pages in a report.
- *
- * @goal test
- * @phase site
*/
+@Mojo( name = "test", defaultPhase = LifecyclePhase.SITE )
public class MyReport
extends AbstractMavenReport
{
diff --git a/src/it/projects/full-reporting/pom.xml
b/src/it/projects/full-reporting/pom.xml
index 7f3ae5fa..bfebab1a 100644
--- a/src/it/projects/full-reporting/pom.xml
+++ b/src/it/projects/full-reporting/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>39</version>
+ <version>42</version>
</parent>
<groupId>org.apache.maven.plugins.site.its</groupId>
diff --git a/src/it/projects/site-deploy/verify.bsh
b/src/it/projects/site-deploy/verify.bsh
index 5fdf251a..2b4715e5 100644
--- a/src/it/projects/site-deploy/verify.bsh
+++ b/src/it/projects/site-deploy/verify.bsh
@@ -65,10 +65,10 @@ try
return false;
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
- int indexOf = downloadContent.indexOf( "Download Maven 3.2.5" );
+ int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" );
if ( indexOf < 0 )
{
- System.err.println( "download.html doesn't contain Download Maven
3.2.5" );
+ System.err.println( "download.html doesn't contain Download Maven
3.6.3" );
return false;
}
}
diff --git
a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
index 27a09918..99c43c6f 100644
---
a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
+++
b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
@@ -199,7 +200,8 @@ public abstract class AbstractSiteDeployWebDavTest extends
AbstractMojoTestCase
setVariableValueToObject(
mojo,
"localRepository",
-
MavenRepositorySystem.createArtifactRepository("local", "foo", null, null,
null));
+ MavenRepositorySystem.createArtifactRepository(
+ "local", "foo", new DefaultRepositoryLayout(),
null, null));
setVariableValueToObject(mojo, "siteTool",
getContainer().lookup(SiteTool.class));
setVariableValueToObject(mojo, "siteDirectory", new
File("foo"));
setVariableValueToObject(mojo, "remoteProjectRepositories",
Collections.emptyList());
