You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:12:54 UTC
[maven-site-plugin] 01/01: mvn4 aggregator
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 787cb332fd3c2e8576baf525c89bc8472b8fd131
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:12:50 2022 +0100
mvn4 aggregator
---
pom.xml | 38 ++++++----------------
src/it/projects/effective-site/pom.xml | 2 +-
.../render/CategorySummaryDocumentRenderer.java | 6 ----
.../site/render/ReportDocumentRenderer.java | 3 --
4 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index d366fac..1ddd445 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath />
</parent>
@@ -195,15 +195,15 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.0.5</mavenVersion>
- <javaVersion>7</javaVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <javaVersion>8</javaVersion>
<!-- for dependencies -->
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
<jettyVersion>9.2.29.v20191105</jettyVersion>
<plexusVersion>1.5.4</plexusVersion>
- <scmVersion>1.4</scmVersion>
- <wagonVersion>3.3.1</wagonVersion>
+ <scmVersion>2.0.0-M2-SNAPSHOT</scmVersion>
+ <wagonVersion>3.5.2-SNAPSHOT</wagonVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<!-- for ITs -->
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
@@ -219,7 +219,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -229,7 +229,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<!-- Maven -->
@@ -365,24 +365,6 @@ under the License.
<version>${doxiaVersion}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-confluence</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-docbook-simple</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-twiki</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
<!-- Doxia Sitetools -->
<dependency>
@@ -499,7 +481,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/it/projects/effective-site/pom.xml b/src/it/projects/effective-site/pom.xml
index f9a9168..48892d8 100644
--- a/src/it/projects/effective-site/pom.xml
+++ b/src/it/projects/effective-site/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>31</version>
+ <version>35-SNAPSHOT</version>
</parent>
<groupId>org.apache.maven.plugins.site.its</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
index e2979f0..21ec694 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
@@ -32,7 +32,6 @@ import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-import org.apache.maven.doxia.tools.MojoLogWrapper;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.i18n.I18N;
@@ -82,11 +81,6 @@ public class CategorySummaryDocumentRenderer
{
SiteRendererSink sink = new SiteRendererSink( renderingContext );
- if ( log != null )
- {
- sink.enableLogging( new MojoLogWrapper( log ) );
- }
-
sink.head();
sink.title();
diff --git a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
index 45cf613..40cf3ad 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
@@ -40,7 +40,6 @@ import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-import org.apache.maven.doxia.tools.MojoLogWrapper;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenMultiPageReport;
import org.apache.maven.reporting.MavenReport;
@@ -280,8 +279,6 @@ public class ReportDocumentRenderer
for ( MultiPageSubSink mySink : sinks )
{
- mySink.enableLogging( new MojoLogWrapper( log ) );
-
outputName = mySink.getOutputName();
log.debug( " Rendering " + outputName );