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-site-plugin.git
commit 59ca8ec5897a8b8983a909d7239b879a0959af01
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun Mar 19 23:08:10 2023 +0100
[MSITE-930] Upgrade plugins and components (in ITs)
---
pom.xml | 14 +++++++-------
src/it/projects/MSITE-497/pom.xml | 2 +-
src/it/projects/MSITE-506/pom.xml | 2 +-
src/it/projects/MSITE-548/root/pom.xml | 2 +-
.../projects/inheritance-interpolation/repo-parent/pom.xml | 2 +-
src/it/projects/inheritedMenus/parentAsRef/pom.xml | 2 +-
src/it/projects/inheritedMenus/parentNotAsRef/pom.xml | 2 +-
src/it/projects/inheritedReports/child/pom.xml | 2 +-
src/it/projects/inheritedReports/verify.bsh | 6 +++---
src/it/projects/new-configuration/pom.xml | 2 +-
src/it/projects/no-version/pom.xml | 2 +-
src/it/projects/resources/pom.xml | 2 +-
src/it/projects/site-attach-descriptor/pom.xml | 2 +-
src/it/projects/site-inheritance/aggregator/pom.xml | 2 +-
src/it/projects/site-inheritance/module/pom.xml | 2 +-
src/it/projects/site-inheritance/parent/pom.xml | 2 +-
src/it/projects/site-sd-submodule/parent/pom.xml | 2 +-
src/it/projects/site-sd-top-parent-no-site/root/pom.xml | 2 +-
src/it/projects/surefire-report/pom.xml | 2 +-
19 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 956d9432..a0a6c1b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,15 +203,15 @@ under the License.
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
<checkstylePluginVersion>3.2.1</checkstylePluginVersion>
- <javadocPluginVersion>3.4.1</javadocPluginVersion>
+ <javadocPluginVersion>3.5.0</javadocPluginVersion>
<pmdPluginVersion>3.20.0</pmdPluginVersion>
<jxrPluginVersion>3.3.0</jxrPluginVersion>
<projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
- <surefirePluginVersion>3.0.0-M8</surefirePluginVersion>
- <mavenPluginPluginVersion>3.7.1</mavenPluginPluginVersion>
+ <surefirePluginVersion>3.0.0</surefirePluginVersion>
+ <mavenPluginPluginVersion>3.8.1</mavenPluginPluginVersion>
<mavenReportingImplVersion>4.0.0-M4</mavenReportingImplVersion>
- <fluidoSkinVersion>2.0.0-M2</fluidoSkinVersion>
- <surefire.version>3.0.0-M8</surefire.version>
+ <fluidoSkinVersion>2.0.0-M3</fluidoSkinVersion>
+ <surefire.version>3.0.0</surefire.version>
<project.build.outputTimestamp>2023-02-11T20:25:37Z</project.build.outputTimestamp>
</properties>
@@ -307,7 +307,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.6.1</version>
+ <version>4.6.2</version>
</dependency>
<dependency>
@@ -324,7 +324,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1</version>
</dependency>
<!-- Doxia -->
diff --git a/src/it/projects/MSITE-497/pom.xml
b/src/it/projects/MSITE-497/pom.xml
index 84df2aeb..e260d25d 100644
--- a/src/it/projects/MSITE-497/pom.xml
+++ b/src/it/projects/MSITE-497/pom.xml
@@ -42,7 +42,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/projects/MSITE-506/pom.xml
b/src/it/projects/MSITE-506/pom.xml
index 9832859c..7bf94632 100644
--- a/src/it/projects/MSITE-506/pom.xml
+++ b/src/it/projects/MSITE-506/pom.xml
@@ -46,7 +46,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-548/root/pom.xml
b/src/it/projects/MSITE-548/root/pom.xml
index fc36ffbc..d8e8d994 100644
--- a/src/it/projects/MSITE-548/root/pom.xml
+++ b/src/it/projects/MSITE-548/root/pom.xml
@@ -53,7 +53,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
index 2db82bf5..d3ca7bef 100644
--- a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
+++ b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
@@ -41,7 +41,7 @@ under the License.
<distUrl>scp://from.repo/dist</distUrl>
<msite604.siteRepositoryId>repo-parent-id</msite604.siteRepositoryId>
<msite604.siteRepositoryBase>default-repository-base-from-repo-parent</msite604.siteRepositoryBase>
- <fluidoSkinVersion>1.11.1</fluidoSkinVersion><!-- invoker interpolation
doesn't apply here: but version is not important at this level -->
+ <fluidoSkinVersion>2.0.0-M3</fluidoSkinVersion><!-- invoker interpolation
doesn't apply here: but version is not important at this level -->
</properties>
<distributionManagement>
diff --git a/src/it/projects/inheritedMenus/parentAsRef/pom.xml
b/src/it/projects/inheritedMenus/parentAsRef/pom.xml
index 993d8b0a..ebda0959 100644
--- a/src/it/projects/inheritedMenus/parentAsRef/pom.xml
+++ b/src/it/projects/inheritedMenus/parentAsRef/pom.xml
@@ -59,7 +59,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
b/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
index 69e400c1..cc019b4c 100644
--- a/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
+++ b/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
@@ -59,7 +59,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/inheritedReports/child/pom.xml
b/src/it/projects/inheritedReports/child/pom.xml
index c5d7de3d..771e2106 100644
--- a/src/it/projects/inheritedReports/child/pom.xml
+++ b/src/it/projects/inheritedReports/child/pom.xml
@@ -40,7 +40,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/inheritedReports/verify.bsh
b/src/it/projects/inheritedReports/verify.bsh
index 3877ef16..7cc6d948 100644
--- a/src/it/projects/inheritedReports/verify.bsh
+++ b/src/it/projects/inheritedReports/verify.bsh
@@ -44,10 +44,10 @@ try
result = false;
}
- File childIndex = new File( childSiteDirectory, "project-summary.html" );
- if ( !childIndex.exists() )
+ File childSummary = new File( childSiteDirectory, "summary.html" );
+ if ( !childSummary.exists() )
{
- System.err.println( "no project-summary file in child." );
+ System.err.println( "no summary file in child." );
result = false;
}
diff --git a/src/it/projects/new-configuration/pom.xml
b/src/it/projects/new-configuration/pom.xml
index cd134fc5..5984903f 100644
--- a/src/it/projects/new-configuration/pom.xml
+++ b/src/it/projects/new-configuration/pom.xml
@@ -82,7 +82,7 @@ under the License.
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>3.2</version>
+ <version>@mavenPluginPluginVersion@</version>
</tagletArtifact>
</tagletArtifacts>
</configuration>
diff --git a/src/it/projects/no-version/pom.xml
b/src/it/projects/no-version/pom.xml
index b29960f6..3ecb5a13 100644
--- a/src/it/projects/no-version/pom.xml
+++ b/src/it/projects/no-version/pom.xml
@@ -51,7 +51,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>@surefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/resources/pom.xml
b/src/it/projects/resources/pom.xml
index c472248f..81d8a666 100644
--- a/src/it/projects/resources/pom.xml
+++ b/src/it/projects/resources/pom.xml
@@ -53,7 +53,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>3.1.0</version>
<executions>
<execution>
<phase>pre-site</phase>
diff --git a/src/it/projects/site-attach-descriptor/pom.xml
b/src/it/projects/site-attach-descriptor/pom.xml
index 2a43411f..9461ea76 100644
--- a/src/it/projects/site-attach-descriptor/pom.xml
+++ b/src/it/projects/site-attach-descriptor/pom.xml
@@ -60,7 +60,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
+ <version>3.1.0</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/site-inheritance/aggregator/pom.xml
b/src/it/projects/site-inheritance/aggregator/pom.xml
index 8f88c3ce..88fa2587 100644
--- a/src/it/projects/site-inheritance/aggregator/pom.xml
+++ b/src/it/projects/site-inheritance/aggregator/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-inheritance/module/pom.xml
b/src/it/projects/site-inheritance/module/pom.xml
index de67f808..8e7370f7 100644
--- a/src/it/projects/site-inheritance/module/pom.xml
+++ b/src/it/projects/site-inheritance/module/pom.xml
@@ -59,7 +59,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-inheritance/parent/pom.xml
b/src/it/projects/site-inheritance/parent/pom.xml
index 0a6a8134..78f89916 100644
--- a/src/it/projects/site-inheritance/parent/pom.xml
+++ b/src/it/projects/site-inheritance/parent/pom.xml
@@ -60,7 +60,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-sd-submodule/parent/pom.xml
b/src/it/projects/site-sd-submodule/parent/pom.xml
index f46c1cb1..987c7cd7 100644
--- a/src/it/projects/site-sd-submodule/parent/pom.xml
+++ b/src/it/projects/site-sd-submodule/parent/pom.xml
@@ -51,7 +51,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-sd-top-parent-no-site/root/pom.xml
b/src/it/projects/site-sd-top-parent-no-site/root/pom.xml
index 3390095b..8281b1be 100644
--- a/src/it/projects/site-sd-top-parent-no-site/root/pom.xml
+++ b/src/it/projects/site-sd-top-parent-no-site/root/pom.xml
@@ -44,7 +44,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/surefire-report/pom.xml
b/src/it/projects/surefire-report/pom.xml
index 0012801c..50c6ff3a 100644
--- a/src/it/projects/surefire-report/pom.xml
+++ b/src/it/projects/surefire-report/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <version>@surefirePluginVersion@</version>
</plugin>
</plugins>
</reporting>
