This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 716bd0d9b4c411be44785788bc83690b7443f0db
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun Mar 19 23:14:14 2023 +0100
[MSITE-931] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M6, Maven Reporting
API/Impl 4.0.0-M5, Maven Reporting Exec 2.0.0-M5
---
pom.xml | 10 +++++-----
.../inheritance-interpolation/repo-parent/pom.xml | 2 +-
.../apache/maven/plugins/site/AbstractSiteMojo.java | 13 -------------
.../plugins/site/deploy/AbstractDeployMojo.java | 2 +-
.../plugins/site/deploy/SiteStageDeployMojo.java | 3 +--
.../site/descriptor/AbstractSiteDescriptorMojo.java | 21 ++++++++++++++++-----
.../site/render/AbstractSiteRenderingMojo.java | 17 ++---------------
.../site/deploy/AbstractSiteDeployWebDavTest.java | 2 +-
8 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index a0a6c1b0..695e7c3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,8 +197,8 @@ under the License.
<javaVersion>8</javaVersion>
<!-- for dependencies -->
<jettyVersion>9.4.50.v20221201</jettyVersion>
- <doxiaVersion>2.0.0-M5</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M5</doxiaSitetoolsVersion>
+ <doxiaVersion>2.0.0-M6</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M6</doxiaSitetoolsVersion>
<wagonVersion>3.5.3</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
@@ -209,7 +209,7 @@ under the License.
<projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
<surefirePluginVersion>3.0.0</surefirePluginVersion>
<mavenPluginPluginVersion>3.8.1</mavenPluginPluginVersion>
- <mavenReportingImplVersion>4.0.0-M4</mavenReportingImplVersion>
+ <mavenReportingImplVersion>4.0.0-M5</mavenReportingImplVersion>
<fluidoSkinVersion>2.0.0-M3</fluidoSkinVersion>
<surefire.version>3.0.0</surefire.version>
<project.build.outputTimestamp>2023-02-11T20:25:37Z</project.build.outputTimestamp>
@@ -220,12 +220,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>4.0.0-M4</version>
+ <version>4.0.0-M5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>2.0.0-M4</version>
+ <version>2.0.0-M5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
diff --git a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
index d3ca7bef..eb69a36d 100644
--- a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
+++ b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>4.0.0-M2</version><!-- invoker interpolation doesn't apply
here: but version is not important at this level -->
+ <version>4.0.0-M5</version><!-- invoker interpolation doesn't apply
here: but version is not important at this level -->
<configuration>
<generateReports>false</generateReports>
</configuration>
diff --git a/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
b/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
index 47ab39cf..44fe1adb 100644
--- a/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.site;
import java.util.List;
import java.util.Locale;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
@@ -70,18 +69,6 @@ public abstract class AbstractSiteMojo extends AbstractMojo {
@Parameter(defaultValue = "${project}", readonly = true)
protected MavenProject project;
- /**
- * The local repository.
- */
- @Parameter(defaultValue = "${localRepository}", readonly = true)
- protected ArtifactRepository localRepository;
-
- /**
- * The reactor projects.
- */
- @Parameter(defaultValue = "${reactorProjects}", required = true, readonly
= true)
- protected List<MavenProject> reactorProjects;
-
protected List<Locale> getLocales() {
return siteTool.getSiteLocales(locales);
}
diff --git
a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
index b7019d54..fe8d2838 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
@@ -590,7 +590,7 @@ public abstract class AbstractDeployMojo extends
AbstractSiteMojo implements Con
while (parent.getParent() != null) {
MavenProject oldProject = parent;
// MSITE-585, MNG-1943
- parent = siteTool.getParentProject(parent, reactorProjects,
localRepository);
+ parent = parent.getParent();
Site oldSite = site;
diff --git
a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
index 13cd5e46..28ad92a1 100644
---
a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
@@ -138,8 +138,7 @@ public class SiteStageDeployMojo extends
AbstractStagingMojo {
// CHECKSTYLE_OFF: InnerAssignment
while ( // MSITE-585, MNG-1943
- (parent = siteTool.getParentProject(current, reactorProjects,
localRepository)) != null
- && stagingSiteURL.equals(getStagingSiteURL(parent))) {
+ (parent = current.getParent()) != null &&
stagingSiteURL.equals(getStagingSiteURL(parent))) {
current = parent;
}
// CHECKSTYLE_ON: InnerAssignment
diff --git
a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java
b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java
index 7695ba44..cb88283e 100644
---
a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.util.List;
import java.util.Locale;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import
org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
import org.apache.maven.doxia.tools.SiteToolException;
@@ -30,6 +29,9 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.site.AbstractSiteMojo;
+import org.apache.maven.project.MavenProject;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.repository.RemoteRepository;
/**
* Abstract class to compute effective site decoration model for site
descriptors.
@@ -44,13 +46,22 @@ public abstract class AbstractSiteDescriptorMojo extends
AbstractSiteMojo {
private DecorationModelInheritanceAssembler assembler;
/**
- * Remote repositories used for the project.
+ * The reactor projects.
+ */
+ @Parameter(defaultValue = "${reactorProjects}", required = true, readonly
= true)
+ protected List<MavenProject> reactorProjects;
+
+ @Parameter(defaultValue = "${repositorySystemSession}", required = true,
readonly = true)
+ protected RepositorySystemSession repoSession;
+
+ /**
+ * Remote project repositories used for the project.
*
* todo this is used for site descriptor resolution - it should relate to
the actual project but for some reason
* they are not always filled in
*/
- @Parameter(defaultValue = "${project.remoteArtifactRepositories}",
readonly = true)
- protected List<ArtifactRepository> repositories;
+ @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly
= true)
+ protected List<RemoteRepository> remoteProjectRepositories;
/**
* Directory containing the <code>site.xml</code> file and the source for
hand written docs (one directory
@@ -78,7 +89,7 @@ public abstract class AbstractSiteDescriptorMojo extends
AbstractSiteMojo {
DecorationModel decorationModel;
try {
decorationModel = siteTool.getDecorationModel(
- siteDirectory, locale, project, reactorProjects,
localRepository, repositories);
+ siteDirectory, locale, project, reactorProjects,
repoSession, remoteProjectRepositories);
} catch (SiteToolException e) {
throw new MojoExecutionException("SiteToolException: " +
e.getMessage(), e);
}
diff --git
a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
index 6577b7b6..94c9d803 100644
---
a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
@@ -106,14 +106,6 @@ public abstract class AbstractSiteRenderingMojo extends
AbstractSiteDescriptorMo
@Parameter(defaultValue = "${reports}", required = true, readonly = true)
protected List<MavenReport> reports;
- /**
- * Alternative directory for xdoc source, useful for m1 to m2 migration
- *
- * @deprecated use the standard m2 directory layout
- */
- @Parameter(defaultValue = "${basedir}/xdocs")
- private File xdocDirectory;
-
/**
* Directory containing generated documentation in source format (Doxia
supported markup).
* This is used to pick up other source docs that might have been
generated at build time (by reports or any other
@@ -205,7 +197,6 @@ public abstract class AbstractSiteRenderingMojo extends
AbstractSiteDescriptorMo
protected List<MavenReportExecution> getReports() throws
MojoExecutionException {
MavenReportExecutorRequest mavenReportExecutorRequest = new
MavenReportExecutorRequest();
- mavenReportExecutorRequest.setLocalRepository(localRepository);
mavenReportExecutorRequest.setMavenSession(mavenSession);
mavenReportExecutorRequest.setProject(project);
mavenReportExecutorRequest.setReportPlugins(getReportingPlugins());
@@ -276,8 +267,8 @@ public abstract class AbstractSiteRenderingMojo extends
AbstractSiteDescriptorMo
SiteRenderingContext context;
try {
- Artifact skinArtifact =
- siteTool.getSkinArtifactFromRepository(localRepository,
repositories, decorationModel);
+ Artifact skinArtifact = siteTool.getSkinArtifactFromRepository(
+ repoSession, remoteProjectRepositories,
decorationModel.getSkin());
getLog().info(buffer().a("Rendering content with ")
.strong(skinArtifact.getId() + " skin")
@@ -304,12 +295,8 @@ public abstract class AbstractSiteRenderingMojo extends
AbstractSiteDescriptorMo
context.setRootDirectory(project.getBasedir());
if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
context.addSiteDirectory(new File(siteDirectory,
locale.toString()));
- context.addModuleDirectory(new File(xdocDirectory,
locale.toString()), "xdoc");
- context.addModuleDirectory(new File(xdocDirectory,
locale.toString()), "fml");
} else {
context.addSiteDirectory(siteDirectory);
- context.addModuleDirectory(xdocDirectory, "xdoc");
- context.addModuleDirectory(xdocDirectory, "fml");
}
if (moduleExcludes != null) {
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 cfa25f9f..792fb9a6 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
@@ -205,7 +205,7 @@ public abstract class AbstractSiteDeployWebDavTest extends
AbstractMojoTestCase
artifactRepositoryFactory.createArtifactRepository("local", "foo", "default",
null, null));
setVariableValueToObject(mojo, "siteTool",
getContainer().lookup(SiteTool.class));
setVariableValueToObject(mojo, "siteDirectory", new
File("foo"));
- setVariableValueToObject(mojo, "repositories",
Collections.emptyList());
+ setVariableValueToObject(mojo, "remoteProjectRepositories",
Collections.emptyList());
}
mojo.execute();
