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:06:26 UTC
[maven-reporting-impl] branch dependency-updates updated (6d05eea -> ddaac14)
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-impl.git.
discard 6d05eea [MSHARED-1028] Upgrade Maven Reporting API to 3.1.0
discard faee2f9 [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
new b3b09af [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
new 6b01959 [MSHARED-1028] Upgrade Maven Reporting API to 3.1.0
new ddaac14 Update plugins in 'use-as-site-report' IT
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 (6d05eea)
\
N -- N -- N refs/heads/dependency-updates (ddaac14)
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 3 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:
src/it/use-as-site-report/pom.xml | 4 ++--
.../java/org/apache/maven/reporting/AbstractMavenReport.java | 5 +++--
.../org/apache/maven/reporting/AbstractMavenReportRenderer.java | 9 +++++----
3 files changed, 10 insertions(+), 8 deletions(-)
[maven-reporting-impl] 03/03: Update plugins in 'use-as-site-report' IT
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-impl.git
commit ddaac1486d58af185b2d065e09616e5704d5dd32
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Feb 5 21:06:13 2022 +0100
Update plugins in 'use-as-site-report' IT
---
src/it/use-as-site-report/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/it/use-as-site-report/pom.xml b/src/it/use-as-site-report/pom.xml
index 0fe7c4a..5371d0f 100644
--- a/src/it/use-as-site-report/pom.xml
+++ b/src/it/use-as-site-report/pom.xml
@@ -37,7 +37,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <version>3.10.0</version>
</plugin>
</plugins>
</build>
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>3.2.1</version>
<reportSets>
<reportSet>
<reports>
[maven-reporting-impl] 01/03: [MSHARED-1027] Update Doxia to 1.11.1 and 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-impl.git
commit b3b09afb4007ca3d76a89508a468f96eff03c804
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 12:50:53 2022 +0100
[MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
---
pom.xml | 9 ++-------
.../java/org/apache/maven/reporting/AbstractMavenReport.java | 5 +++--
.../org/apache/maven/reporting/AbstractMavenReportRenderer.java | 9 +++++----
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index f5234d9..93dbb31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
<properties>
<mavenVersion>3.1.0</mavenVersion>
- <doxiaVersion>1.7</doxiaVersion>
- <doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
+ <doxiaVersion>1.11.1</doxiaVersion>
+ <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
@@ -120,11 +120,6 @@
<artifactId>doxia-site-renderer</artifactId>
<version>${doxiaSitetoolsVersion}</version>
</dependency>
- <dependency><!-- TODO remove dependency when upgrading Doxia Sitetools to 1.7.5 -->
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<!-- misc -->
<dependency>
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 8a2b3aa..4dc0736 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -132,7 +132,8 @@ public abstract class AbstractMavenReport
siteContext.setLocale( locale );
siteContext.setTemplateProperties( getTemplateProperties() );
- RenderingContext context = new RenderingContext( outputDirectory, filename );
+ // TODO Replace null with real value
+ RenderingContext context = new RenderingContext( outputDirectory, filename, null );
SiteRendererSink sink = new SiteRendererSink( context );
@@ -149,7 +150,7 @@ public abstract class AbstractMavenReport
new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, filename ) ),
getOutputEncoding() ) )
{
- getSiteRenderer().generateDocument( writer, sink, siteContext );
+ getSiteRenderer().mergeDocumentIntoSite( writer, sink, siteContext );
}
}
}
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
index 5acd06e..4c9a07c 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
@@ -20,6 +20,7 @@ package org.apache.maven.reporting;
*/
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.shared.utils.StringUtils;
@@ -34,11 +35,11 @@ import java.util.Properties;
/**
* <p>An abstract class to manage report generation, with many helper methods to ease the job: you just need to
* implement getTitle() and renderBody().</p>
- *
+ *
* <p><strong>TODO</strong> Later it may be appropriate to create something like a VelocityMavenReportRenderer
* that could take a velocity template and pipe that through Doxia rather than coding them
* up like this.</p>
- *
+ *
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -446,7 +447,7 @@ public abstract class AbstractMavenReportRenderer
*/
protected void verbatimText( String text )
{
- sink.verbatim( true );
+ sink.verbatim( SinkEventAttributeSet.BOXED );
text( text );
@@ -471,7 +472,7 @@ public abstract class AbstractMavenReportRenderer
}
else
{
- sink.verbatim( true );
+ sink.verbatim( SinkEventAttributeSet.BOXED );
link( href, text );
[maven-reporting-impl] 02/03: [MSHARED-1028] 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-impl.git
commit 6b019596a05295eb4cc32d83fd8d7e169fc4deee
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 13:12:35 2022 +0100
[MSHARED-1028] Upgrade Maven Reporting API to 3.1.0
---
pom.xml | 2 +-
src/it/setup-reporting-plugin/pom.xml | 2 +-
src/main/java/org/apache/maven/reporting/AbstractMavenReport.java | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 93dbb31..fafa1d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,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/it/setup-reporting-plugin/pom.xml b/src/it/setup-reporting-plugin/pom.xml
index 744f21f..c7a3191 100644
--- a/src/it/setup-reporting-plugin/pom.xml
+++ b/src/it/setup-reporting-plugin/pom.xml
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0</version>
</dependency>
<!-- plugin API and plugin-tools -->
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 4dc0736..e1279e8 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -189,7 +189,6 @@ public abstract class AbstractMavenReport
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated
- @Override
public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
throws MavenReportException
{
@@ -202,10 +201,10 @@ public abstract class AbstractMavenReport
* @param sink
* @param locale
* @throws MavenReportException
- * @see org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink, Locale)
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated
+ @Override
public void generate( Sink sink, Locale locale )
throws MavenReportException
{