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/02/05 20:35:32 UTC
[maven-reporting-exec] branch doxia-2.0.0 updated (97d6583 -> 04efebb)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git.
discard 97d6583 Prepare for Doxia 2.0.0
add 4c3f234 Use Shared GitHub Actions
add 7bfd4cf configure notifications
add 526dbc3 [MSHARED-1029] Drop support for maven below 3.2.x (#8)
add cbab4a2 Fix Maven site build
add 21caf75 Fix build forked-lifecycle IT on macOS
new 04efebb Prepare for Doxia 2.0.0
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 (97d6583)
\
N -- N -- N refs/heads/doxia-2.0.0 (04efebb)
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 1 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:
.asf.yaml | 9 ++
.../workflows/maven-verify.yml | 15 +-
pom.xml | 91 +++++------
src/it/forked-lifecycle/pom.xml | 2 +-
.../exec/DefaultMavenPluginManagerHelper.java | 166 ++-------------------
.../exec/TestDefaultMavenReportExecutor.java | 18 ++-
6 files changed, 84 insertions(+), 217 deletions(-)
copy src/it/aether/invoker.properties => .github/workflows/maven-verify.yml (75%)
[maven-reporting-exec] 01/01: Prepare for Doxia 2.0.0
Posted by mi...@apache.org.
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 04efebbabb5bff3606b5beaf441e4fe409db88d9
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 ++++----
.../reporting/exec/TestDefaultMavenReportExecutor.java | 4 ++--
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0c856bd..3c4606c 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>
<!-- Eclipse Aether for Maven 3.1+ -->
<dependency>
@@ -189,7 +194,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()
diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
index e5381e7..5f3667e 100644
--- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
+++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
@@ -129,7 +129,7 @@ public class TestDefaultMavenReportExecutor
Plugin plugin = new Plugin();
plugin.setGroupId( "org.apache.maven.plugins" );
plugin.setArtifactId( "maven-javadoc-plugin" );
- plugin.setVersion( "3.0.0-M1" );
+ plugin.setVersion( "3.3.2-SNAPSHOT" );
Dependency dependency = new Dependency();
dependency.setGroupId( "commons-lang" );
dependency.setArtifactId( "commons-lang" );
@@ -170,7 +170,7 @@ public class TestDefaultMavenReportExecutor
ReportPlugin reportPlugin = new ReportPlugin();
reportPlugin.setGroupId( "org.apache.maven.plugins" );
reportPlugin.setArtifactId( "maven-javadoc-plugin" );
- reportPlugin.setVersion( "3.0.0-M1" );
+ reportPlugin.setVersion( "3.3.2-SNAPSHOT" );
for ( ReportSet reportSet : javadocReportSets )
{