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/07/01 17:42:28 UTC
[maven-reporting-impl] branch master updated (872897f -> 7e82af4)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
from 872897f [maven-release-plugin] prepare for next development iteration
new 392ae3b [MSHARED-1093] Upgrade Maven Parent to 36
new aa3c8cc [MSHARED-1094] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M3
new adc4efb [MSHARED-1097] Update dependencies
new 7e82af4 [MSHARED-1095] Upgrade plugins and components in ITs
The 4 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 | 13 +++++++------
src/it/setup-reporting-plugin/pom.xml | 17 +++++++----------
src/it/use-as-site-report/pom.xml | 4 ++--
.../maven/reporting/AbstractMavenReportRenderer.java | 4 ++--
4 files changed, 18 insertions(+), 20 deletions(-)
[maven-reporting-impl] 04/04: [MSHARED-1095] Upgrade plugins and components in ITs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit 7e82af48a2bfab8198922bab7d7444c47e6acb02
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jul 1 19:30:49 2022 +0200
[MSHARED-1095] Upgrade plugins and components in ITs
---
src/it/setup-reporting-plugin/pom.xml | 17 +++++++----------
src/it/use-as-site-report/pom.xml | 4 ++--
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/it/setup-reporting-plugin/pom.xml b/src/it/setup-reporting-plugin/pom.xml
index c7a3191..a6ad2c9 100644
--- a/src/it/setup-reporting-plugin/pom.xml
+++ b/src/it/setup-reporting-plugin/pom.xml
@@ -46,26 +46,26 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>@reportingApiVersion@</version>
</dependency>
<!-- plugin API and plugin-tools -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.5</version>
+ <version>@mavenVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.3</version>
+ <version>3.6.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>0.7</version>
+ <version>3.3.4</version>
</dependency>
</dependencies>
@@ -73,16 +73,16 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.10.1</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.4</version>
<executions>
<execution>
<id>default-descriptor</id>
@@ -93,9 +93,6 @@ under the License.
<goals>
<goal>helpmojo</goal>
</goals>
- <configuration><!-- TODO: remove when upgrading plugin-tools to 3.4: see MPLUGIN-238 -->
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/it/use-as-site-report/pom.xml b/src/it/use-as-site-report/pom.xml
index 5371d0f..9a834aa 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.10.0</version>
+ <version>4.0.0-M2</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>3.2.1</version>
+ <version>3.2.2</version>
<reportSets>
<reportSet>
<reports>
[maven-reporting-impl] 01/04: [MSHARED-1093] Upgrade Maven Parent to 36
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit 392ae3b18f79f71f86585e7d531efe3f9dc13f49
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jul 1 19:19:30 2022 +0200
[MSHARED-1093] Upgrade Maven Parent to 36
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9225a21..5b7f7a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>34</version>
+ <version>36</version>
<relativePath />
</parent>
[maven-reporting-impl] 02/04: [MSHARED-1094] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit aa3c8cc41ca438fad975a516bec794289f62daf8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jul 1 19:22:43 2022 +0200
[MSHARED-1094] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M3
---
pom.xml | 4 ++--
.../java/org/apache/maven/reporting/AbstractMavenReportRenderer.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b7f7a8..d76c4b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.2.5</mavenVersion>
- <doxiaVersion>2.0.0-M2</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M2</doxiaSitetoolsVersion>
+ <doxiaVersion>2.0.0-M3</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M3</doxiaSitetoolsVersion>
<project.build.outputTimestamp>2022-04-20T18:18:05Z</project.build.outputTimestamp>
</properties>
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
index 4c9a07c..24ef9a0 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
@@ -442,7 +442,7 @@ public abstract class AbstractMavenReportRenderer
*
* @param text a text, could be null.
* @see #text(String)
- * @see Sink#verbatim(boolean)
+ * @see Sink#verbatim(org.apache.maven.doxia.sink.SinkEventAttributes)
* @see Sink#verbatim_()
*/
protected void verbatimText( String text )
@@ -461,7 +461,7 @@ public abstract class AbstractMavenReportRenderer
* @param href an href could be null
* @see #link(String, String)
* @see #verbatimText(String)
- * @see Sink#verbatim(boolean)
+ * @see Sink#verbatim(org.apache.maven.doxia.sink.SinkEventAttributes)
* @see Sink#verbatim_()
*/
protected void verbatimLink( String text, String href )
[maven-reporting-impl] 03/04: [MSHARED-1097] Update dependencies
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit adc4efb37f01a8d64c484aeb42f23caf7e3fd8a6
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jul 1 19:25:15 2022 +0200
[MSHARED-1097] Update dependencies
---
pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index d76c4b2..0bdb47d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
<mavenVersion>3.2.5</mavenVersion>
<doxiaVersion>2.0.0-M3</doxiaVersion>
<doxiaSitetoolsVersion>2.0.0-M3</doxiaSitetoolsVersion>
+ <reportingApiVersion>4.0.0-M1</reportingApiVersion>
<project.build.outputTimestamp>2022-04-20T18:18:05Z</project.build.outputTimestamp>
</properties>
@@ -79,7 +80,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>4.0.0-M1</version>
+ <version>${reportingApiVersion}</version>
</dependency>
<!-- Maven -->
@@ -130,14 +131,14 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.1</version>
+ <version>3.4.2</version>
</dependency>
<!-- test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>