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 2023/10/03 09:03:00 UTC
[maven-site-plugin] 02/02: [MSITE-980] Upgrade plugins and components (in ITs)
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 2a0790b9db9f036e1e2007915f035df4513b95ad
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Oct 3 11:01:46 2023 +0200
[MSITE-980] Upgrade plugins and components (in ITs)
---
pom.xml | 12 ++++++------
.../maven/plugins/site/descriptor/EffectiveSiteMojo.java | 5 ++++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 754cfaaf..abb658ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@ under the License.
<!-- for dependencies -->
<jettyVersion>9.4.51.v20230217</jettyVersion>
<doxiaVersion>2.0.0-M7</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M11</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>2.0.0-M12</doxiaSitetoolsVersion>
<wagonVersion>3.5.3</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
@@ -209,7 +209,7 @@ under the License.
<projectInfoReportsPluginVersion>3.4.5</projectInfoReportsPluginVersion>
<surefirePluginVersion>3.0.0</surefirePluginVersion>
<mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
- <mavenReportingImplVersion>4.0.0-M9</mavenReportingImplVersion>
+ <mavenReportingImplVersion>4.0.0-M10</mavenReportingImplVersion>
<testingFluidoSkinVersion>2.0.0-M6</testingFluidoSkinVersion>
<surefire.version>3.1.2</surefire.version>
<project.build.outputTimestamp>2023-07-07T19:06:32Z</project.build.outputTimestamp>
@@ -225,7 +225,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>2.0.0-M9</version>
+ <version>2.0.0-M10</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -286,7 +286,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</dependency>
<!-- dependencies to annotations -->
@@ -410,7 +410,7 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <version>3.13.0</version>
</dependency>
<dependency>
@@ -488,7 +488,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
+ <version>2.14.0</version>
<scope>test</scope>
</dependency>
diff --git a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
index a85bd369..5566b837 100644
--- a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
@@ -137,7 +137,10 @@ public class EffectiveSiteMojo extends AbstractSiteDescriptorMojo {
}
effectiveSite = sWriter.toString();
- effectiveSite = effectiveSite.substring(effectiveSite.indexOf("<project ")); // remove "<?xml" header
+ // remove XML prolog
+ int xmlPrologStart = effectiveSite.indexOf("<?xml");
+ int xmlPrologEnd = effectiveSite.indexOf("?>", xmlPrologStart);
+ effectiveSite = effectiveSite.substring(xmlPrologEnd + 2).trim();
writeComment(writer, "Effective site descriptor for project \'" + project.getId() + "\'");