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/07 21:27:27 UTC
[maven-reporting-exec] branch update-it-plugins updated (b6692d0 -> 35b2427)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch update-it-plugins
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git.
discard b6692d0 Update plugins in ITs
new 35b2427 [MSHARED-1034] Upgrade plugins and components in ITs
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 (b6692d0)
\
N -- N -- N refs/heads/update-it-plugins (35b2427)
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:
src/it/reportConfig/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-reporting-exec] 01/01: [MSHARED-1034] 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 update-it-plugins
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git
commit 35b2427c40b4181e5d08ca747cdda225a88074aa
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Feb 5 23:21:08 2022 +0100
[MSHARED-1034] Upgrade plugins and components in ITs
* Maven Site Plugin to 3.10.0
* Maven Project Info Reports Plugin to 3.2.1
* Maven Reporting Impl to 3.1.0
This closes #11
---
pom.xml | 2 ++
src/it/aether/pom.xml | 4 ++--
src/it/forked-lifecycle/pom.xml | 4 ++--
src/it/pluginManagement_dependencies/pom.xml | 5 +++--
src/it/reportConfig/pom.xml | 8 ++++----
.../main/java/org/apache/maven/shared/it/ConfigurationReport.java | 3 +--
6 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 75c0276..5c1dd0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,8 @@
<aetherVersion>1.0.0.v20140518</aetherVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-06-16T19:43:55Z</project.build.outputTimestamp>
+ <sitePluginVersion>3.10.0</sitePluginVersion>
+ <projectInfoReportsPluginVersion>3.2.1</projectInfoReportsPluginVersion>
</properties>
<dependencies>
diff --git a/src/it/aether/pom.xml b/src/it/aether/pom.xml
index 8dcc398..30bfc61 100644
--- a/src/it/aether/pom.xml
+++ b/src/it/aether/pom.xml
@@ -36,7 +36,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.7</version>
+ <version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
@@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/forked-lifecycle/pom.xml b/src/it/forked-lifecycle/pom.xml
index a1baefd..1e14926 100644
--- a/src/it/forked-lifecycle/pom.xml
+++ b/src/it/forked-lifecycle/pom.xml
@@ -36,7 +36,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.7</version>
+ <version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
@@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/pluginManagement_dependencies/pom.xml b/src/it/pluginManagement_dependencies/pom.xml
index 8d09ab5..5b4e77e 100644
--- a/src/it/pluginManagement_dependencies/pom.xml
+++ b/src/it/pluginManagement_dependencies/pom.xml
@@ -49,7 +49,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.7.1</version>
+ <version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
@@ -62,7 +62,7 @@ under the License.
</pluginManagement>
</build>
<reporting>
- <plugins>
+ <plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<reportSets>
@@ -76,6 +76,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/reportConfig/pom.xml b/src/it/reportConfig/pom.xml
index a7c6b77..ee04529 100644
--- a/src/it/reportConfig/pom.xml
+++ b/src/it/reportConfig/pom.xml
@@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.2</version>
+ <version>3.1.0</version>
</dependency>
</dependencies>
@@ -52,7 +52,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.7</version>
+ <version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
@@ -70,14 +70,14 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
</reports>
</reportSet>
- </reportSets>
+ </reportSets>
</plugin>
</plugins>
</reporting>
diff --git a/src/it/reportConfig/src/main/java/org/apache/maven/shared/it/ConfigurationReport.java b/src/it/reportConfig/src/main/java/org/apache/maven/shared/it/ConfigurationReport.java
index 04e2a7e..9fa320d 100644
--- a/src/it/reportConfig/src/main/java/org/apache/maven/shared/it/ConfigurationReport.java
+++ b/src/it/reportConfig/src/main/java/org/apache/maven/shared/it/ConfigurationReport.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.it;
*/
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
@@ -31,7 +30,7 @@ import java.util.Locale;
/**
* Report that displays effective parameter values: used to check how report values
* are inherited/overridden from build.pluginManagement and not build.plugins.
- *
+ *
* @goal test
* @phase site
*/