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/08/14 09:11:14 UTC
[maven-plugin-tools] branch MPLUGIN-415 updated (570c0c9c -> 56cab894)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MPLUGIN-415
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
omit 570c0c9c [MPLUGIN-415] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
new 56cab894 [MPLUGIN-415] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.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 (570c0c9c)
\
N -- N -- N refs/heads/MPLUGIN-415 (56cab894)
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 1 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:
maven-plugin-plugin/pom.xml | 2 +-
maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[maven-plugin-tools] 01/01: [MPLUGIN-415] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MPLUGIN-415
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 56cab89496282a31f9331332b36d22d4ef118706
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Aug 7 21:14:21 2022 +0200
[MPLUGIN-415] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
This also upgrades for ITs:
* Maven Site Plugin to 3.12.1
* Maven Project Info Reports Plugin to 3.4.1
This closes #132
---
maven-plugin-plugin/pom.xml | 6 +++---
maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml | 2 +-
maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml | 8 ++++----
maven-plugin-plugin/src/it/plugin-report/pom.xml | 8 ++++----
maven-plugin-tools-generators/pom.xml | 4 ++--
pom.xml | 4 +++-
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 448f6bd9..ef42ceab 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>${reportingImplVersion}</version>
</dependency>
<!-- plexus -->
@@ -328,8 +328,8 @@
<settingsFile>src/it/settings.xml</settingsFile>
<streamLogsOnFailures>true</streamLogsOnFailures>
<filterProperties>
- <sitePluginVersion>3.11.0</sitePluginVersion>
- <projectInfoReportsPlugin>3.4.0</projectInfoReportsPlugin>
+ <sitePluginVersion>3.12.1</sitePluginVersion>
+ <projectInfoReportsPlugin>3.4.1</projectInfoReportsPlugin>
<antVersion>${antVersion}</antVersion>
</filterProperties>
<properties>
diff --git a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
index cb52ee57..1b283edb 100644
--- a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
@@ -61,7 +61,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.4.1</version>
<configuration>
<level>private</level>
</configuration>
diff --git a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
index be4a57f9..293af039 100644
--- a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
@@ -63,13 +63,13 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>@reportingApiVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>@reportingImplVersion@</version>
</dependency>
</dependencies>
diff --git a/maven-plugin-plugin/src/it/plugin-report/pom.xml b/maven-plugin-plugin/src/it/plugin-report/pom.xml
index 6cdcefda..290559c2 100644
--- a/maven-plugin-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-report/pom.xml
@@ -63,13 +63,13 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>@reportingApiVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>@reportingImplVersion@</version>
</dependency>
</dependencies>
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index 88ef51eb..d022179b 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>${reportingApiVersion}</version>
</dependency>
<!-- plexus -->
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>${reportingImplVersion}</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/pom.xml b/pom.xml
index c1ea31da..218d8d94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,8 @@
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
<asmVersion>9.3</asmVersion>
<plexusUtilsVersion>3.4.2</plexusUtilsVersion>
+ <reportingApiVersion>3.1.1</reportingApiVersion>
+ <reportingImplVersion>3.2.0</reportingImplVersion>
<project.build.outputTimestamp>2022-01-10T23:05:38Z</project.build.outputTimestamp>
</properties>
@@ -169,7 +171,7 @@
<artifactId>maven-settings</artifactId>
<version>${mavenVersion}</version>
</dependency>
-
+
<!-- plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>