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/04/15 18:31:45 UTC
[maven-reporting-exec] branch doxia-2.0.0 updated (04efebb -> 4f23637)
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 04efebb Prepare for Doxia 2.0.0
add 904c915 [MSHARED-1025] Update Doxia Sitetools to 1.11.1
add 6d8049a [MSHARED-1026] Upgrade Maven Reporting API to 3.1.0
add 35b2427 [MSHARED-1034] Upgrade plugins and components in ITs
add c23c32b [maven-release-plugin] prepare release maven-reporting-exec-1.6.0
add 5d2227c [maven-release-plugin] prepare for next development iteration
new 4f23637 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 (04efebb)
\
N -- N -- N refs/heads/doxia-2.0.0 (4f23637)
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:
pom.xml | 10 ++++++----
src/it/aether/pom.xml | 4 ++--
src/it/forked-lifecycle/pom.xml | 4 ++--
src/it/pluginManagement_dependencies/pom.xml | 5 +++--
src/it/reportConfig/pom.xml | 8 ++++----
.../java/org/apache/maven/shared/it/ConfigurationReport.java | 3 +--
.../maven/reporting/exec/DefaultMavenReportExecutor.java | 8 +++++++-
7 files changed, 25 insertions(+), 17 deletions(-)
[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 4f23637e4309077e404d4076118347a5fda96897
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jan 23 20:51:15 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 9 +++++++--
.../org/apache/maven/reporting/exec/MavenReportExecution.java | 6 +++---
.../maven/reporting/exec/TestDefaultMavenReportExecutor.java | 4 ++--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 99c6df4..350fadf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<!-- Maven -->
@@ -117,6 +117,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>
@@ -191,7 +196,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>1.11.1</version>
+ <version>2.0.0-M2</version>
<scope>test</scope>
<exclusions>
<exclusion>
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 de0205c..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,7 +32,7 @@ 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.apache.maven.doxia.sink.Sink, java.util.Locale)}
@@ -41,7 +41,7 @@ import org.apache.maven.reporting.MavenReport;
* <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 )
{