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/24 12:08:37 UTC
[maven-reporting-exec] branch dependency-updates updated (f8036d7 -> 997ac94)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git.
discard f8036d7 [MSHARED-1026] Upgrade Maven Reporting API to 3.1.0
discard 2189e5b [MSHARED-1025] Update Doxia Sitetools to 1.11.1
new 1ce0716 [MSHARED-1025] Update Doxia Sitetools to 1.11.1
new 997ac94 [MSHARED-1026] Upgrade Maven Reporting API to 3.1.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 (f8036d7)
\
N -- N -- N refs/heads/dependency-updates (997ac94)
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 2 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:
.../org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java | 3 +++
.../java/org/apache/maven/reporting/exec/MavenReportExecution.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
[maven-reporting-exec] 02/02: [MSHARED-1026] Upgrade Maven Reporting API to 3.1.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git
commit 997ac944fe7d0014be48ef7e88bb1a4b7120ec57
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 12:19:19 2022 +0100
[MSHARED-1026] Upgrade Maven Reporting API to 3.1.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 49abf96..5a0ed78 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 -->
[maven-reporting-exec] 01/02: [MSHARED-1025] Update Doxia Sitetools to 1.11.1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git
commit 1ce071616b0a38f6f77bf61bbe8bbc7fa78cbd6a
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 12:17:19 2022 +0100
[MSHARED-1025] Update Doxia Sitetools to 1.11.1
---
pom.xml | 2 +-
.../org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java | 3 +++
.../java/org/apache/maven/reporting/exec/MavenReportExecution.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1d71d0e..49abf96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,7 +219,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>1.1.4</version>
+ <version>1.11.1</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..42cc01f 100644
--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
+++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
@@ -117,10 +117,13 @@ public class DefaultMavenReportExecutor
"org.apache.maven.reporting.MavenMultiPageReport",
"org.apache.maven.doxia.siterenderer.Renderer",
"org.apache.maven.doxia.sink.SinkFactory",
+ // TODO Will be removed with Doxia 2.0.0-M1
"org.codehaus.doxia.sink.Sink",
"org.apache.maven.doxia.sink.Sink",
"org.apache.maven.doxia.sink.SinkEventAttributes",
+ // TODO Will be removed with Doxia 2.0.0-M1
"org.apache.maven.doxia.logging.LogEnabled",
+ // TODO Will be removed with Doxia 2.0.0-M1
"org.apache.maven.doxia.logging.Log" );
private static final List<String> EXCLUDES = Arrays.asList( "doxia-site-renderer", "doxia-sink-api",
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..de0205c 100644
--- a/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
+++ b/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
@@ -35,7 +35,7 @@ import org.apache.maven.reporting.MavenReport;
* </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>