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:37:13 UTC

[maven-reporting-exec] branch dependency-updates updated (881a6e8 -> 6d8049a)

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 881a6e8  [MSHARED-1026] Upgrade Maven Reporting API to 3.1.0
 discard dd267a1  [MSHARED-1025] Update Doxia Sitetools to 1.11.1
     new 904c915  [MSHARED-1025] Update Doxia Sitetools to 1.11.1
     new 6d8049a  [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   (881a6e8)
            \
             N -- N -- N   refs/heads/dependency-updates (6d8049a)

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:
 pom.xml                                                           | 2 +-
 .../apache/maven/reporting/exec/DefaultMavenReportExecutor.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

[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 904c915bf91c9b07e476a237a76184cf13618c89
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 +-
 .../maven/reporting/exec/DefaultMavenReportExecutor.java      | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0c856bd..228fb2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,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..1d53bc5 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,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",
@@ -551,7 +554,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 +640,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 +672,7 @@ public class DefaultMavenReportExecutor
      * </ul>
      * </p>
      * The plugin could only be present in the dependency management section.
-     * 
+     *
      * @param mavenReportExecutorRequest
      * @param buildPlugin
      * @param reportPlugin

[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 6d8049a2a425f619fbaf2a0784a17dded5f2ba62
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 +-
 src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 228fb2f..75c0276 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</version>
     </dependency>
 
     <!-- Maven -->
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>