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 2024/04/30 07:09:46 UTC
(maven-site-plugin) 01/01: [MSITE-1003] Upgrade plugins and components (in ITs)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-1003
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit da9e2dc0075028de766a1fa71a3e9101353d8961
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Apr 30 09:09:32 2024 +0200
[MSITE-1003] Upgrade plugins and components (in ITs)
This closes #185
---
pom.xml | 16 ++++++++--------
src/it/projects/MSITE-627/pom.xml | 3 +++
.../main/java/org/apache/maven/plugins/it/MyReport.java | 3 ++-
src/it/projects/MSITE-842/project/pom.xml | 3 +++
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2d9b24e7..dff32f4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,9 +197,9 @@ under the License.
<minimalMavenBuildVersion>${mavenVersion}</minimalMavenBuildVersion>
<javaVersion>8</javaVersion>
<!-- for dependencies -->
- <jettyVersion>9.4.53.v20231009</jettyVersion>
- <doxiaVersion>2.0.0-M8</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M16</doxiaSitetoolsVersion>
+ <jettyVersion>9.4.54.v20240208</jettyVersion>
+ <doxiaVersion>2.0.0-M10</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M18</doxiaSitetoolsVersion>
<wagonVersion>3.5.3</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
@@ -209,8 +209,8 @@ under the License.
<jxrPluginVersion>3.3.1</jxrPluginVersion>
<projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
<surefirePluginVersion>3.2.2</surefirePluginVersion>
- <mavenPluginPluginVersion>3.10.2</mavenPluginPluginVersion>
- <mavenReportingImplVersion>4.0.0-M13</mavenReportingImplVersion>
+ <mavenPluginPluginVersion>3.12.0</mavenPluginPluginVersion>
+ <mavenReportingImplVersion>4.0.0-M14</mavenReportingImplVersion>
<testingFluidoSkinVersion>2.0.0-M8</testingFluidoSkinVersion>
<project.build.outputTimestamp>2023-12-14T15:35:29Z</project.build.outputTimestamp>
@@ -220,12 +220,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>4.0.0-M9</version>
+ <version>4.0.0-M11</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>2.0.0-M12</version>
+ <version>2.0.0-M13</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -491,7 +491,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.15.1</version>
+ <version>2.16.1</version>
<scope>test</scope>
</dependency>
diff --git a/src/it/projects/MSITE-627/pom.xml b/src/it/projects/MSITE-627/pom.xml
index 5def1bae..9847df86 100644
--- a/src/it/projects/MSITE-627/pom.xml
+++ b/src/it/projects/MSITE-627/pom.xml
@@ -55,6 +55,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@mavenPluginPluginVersion@</version>
+ <configuration>
+ <goalPrefix>MSITE-627</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
index 8fba898f..ea622a38 100644
--- a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
+++ b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugins.it;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.impl.SinkAdapter;
+import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
@@ -79,7 +80,7 @@ public class MyReport
final Sink sa = new SinkAdapter()
{
@Override
- public void text( String text )
+ public void text( String text, SinkEventAttributes attributes )
{
s.text( text.replace( "OK", "passed" ) );
}
diff --git a/src/it/projects/MSITE-842/project/pom.xml b/src/it/projects/MSITE-842/project/pom.xml
index e9c34723..874ec37e 100644
--- a/src/it/projects/MSITE-842/project/pom.xml
+++ b/src/it/projects/MSITE-842/project/pom.xml
@@ -61,6 +61,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@mavenPluginPluginVersion@</version>
+ <configuration>
+ <goalPrefix>MSITE-842</goalPrefix>
+ </configuration>
</plugin>
</plugins>