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/01/23 19:51:22 UTC
[maven-reporting-exec] 01/01: Prepare for Doxia 2.0.0
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git
commit d9c77a6e0e0ae5d1511f8e8077c48f66d40cfcad
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jan 23 20:51:15 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 9 +++++++--
.../maven/reporting/exec/DefaultMavenReportExecutor.java | 13 +++++--------
.../apache/maven/reporting/exec/MavenReportExecution.java | 8 ++++----
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1d71d0e..d93a7af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<!-- Maven -->
@@ -115,6 +115,11 @@
<artifactId>plexus-utils</artifactId>
<version>3.1.0</version><!-- do not upgrade to 3.2.0+ because it adds Xpp3Dom.getInputLocation(): see MSHARED-921 -->
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>2.6.0</version>
+ </dependency>
<!-- Sonatype Aether for Maven 3.0.x -->
<dependency>
@@ -219,7 +224,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>1.1.4</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
index 419bd27..050d2f5 100644
--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
+++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
@@ -91,7 +91,7 @@ import org.codehaus.plexus.util.xml.Xpp3DomUtils;
* LifecycleExecutor.calculateForkedExecutions(...)} if any forked execution is needed: if yes, execute the forked
* execution here</li>
* </ul>
- *
+ *
* @author Olivier Lamy
*/
@Component( role = MavenReportExecutor.class )
@@ -117,11 +117,8 @@ public class DefaultMavenReportExecutor
"org.apache.maven.reporting.MavenMultiPageReport",
"org.apache.maven.doxia.siterenderer.Renderer",
"org.apache.maven.doxia.sink.SinkFactory",
- "org.codehaus.doxia.sink.Sink",
"org.apache.maven.doxia.sink.Sink",
- "org.apache.maven.doxia.sink.SinkEventAttributes",
- "org.apache.maven.doxia.logging.LogEnabled",
- "org.apache.maven.doxia.logging.Log" );
+ "org.apache.maven.doxia.sink.SinkEventAttributes" );
private static final List<String> EXCLUDES = Arrays.asList( "doxia-site-renderer", "doxia-sink-api",
"maven-reporting-api" );
@@ -551,7 +548,7 @@ public class DefaultMavenReportExecutor
* <li>ask {@link PluginVersionResolver} to get a fallback version and display a warning as it's not a recommended
* use.</li>
* </ol>
- *
+ *
* @param reportPlugin the report plugin to resolve the version
* @param mavenReportExecutorRequest the current report execution context
* @return the report plugin version
@@ -637,7 +634,7 @@ public class DefaultMavenReportExecutor
/**
* Search similar (same groupId and artifactId) plugin as a given report plugin.
- *
+ *
* @param reportPlugin the report plugin to search for a similar plugin
* @param plugins the candidate plugins
* @return the first similar plugin
@@ -669,7 +666,7 @@ public class DefaultMavenReportExecutor
* </ul>
* </p>
* The plugin could only be present in the dependency management section.
- *
+ *
* @param mavenReportExecutorRequest
* @param buildPlugin
* @param reportPlugin
diff --git a/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java b/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
index b857731..b7fae49 100644
--- a/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
+++ b/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
@@ -32,16 +32,16 @@ import org.apache.maven.reporting.MavenReport;
* <li>the goal name associated to the report,</li>
* <li>the associated {@link ClassLoader} for the report generation,</li>
* <li>the {@link Plugin} associated to the {@link MavenReport}.</li>
- * </ul>
+ * </ul>
* <p>
* With this bean, a plugin wanting to generate a report (= <i>"execute"</i> the report) has to call the
- * {@link MavenReport#generate(org.codehaus.doxia.sink.Sink, java.util.Locale)}
+ * {@link MavenReport#generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)}
* method, setting the current {@link Thread} classLoader first with {@link #classLoader}.
* </p>
* <p>
* This bean is instantiated by {@link MavenReportExecutor}.
* </p>
- *
+ *
* @author Olivier Lamy
*/
public class MavenReportExecution
@@ -94,7 +94,7 @@ public class MavenReportExecution
{
Thread.currentThread().setContextClassLoader( originalClassLoader );
}
- }
+ }
}
public MavenReport getMavenReport()