This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINVOKER-373
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit f06b4795d9d4279f6d023fda1e78bdf54f20969e
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Sun Nov 17 14:56:17 2024 +0100
[MINVOKER-373] Switch to Doxia 2
---
pom.xml | 11 +++++------
src/it/script-classpath-duplicates/pom.xml | 2 +-
src/site/apt/groovy-version.apt.vm | 8 ++++----
src/site/site.xml | 6 +++---
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58c8ee2..6ee4640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,10 @@ under the License.
<beanshell-artifactId>bsh</beanshell-artifactId>
<beanshell-version>2.0b6</beanshell-version>
<project.build.outputTimestamp>2024-10-18T16:49:15Z</project.build.outputTimestamp>
- <groovy-version>4.0.23</groovy-version>
+ <groovyVersion>4.0.23</groovyVersion>
+ <!-- Doxia 2.0 -->
+ <version.maven-site-plugin>3.21.0</version.maven-site-plugin>
+ <version.maven-fluido-skin>2.0.0</version.maven-fluido-skin>
</properties>
<dependencyManagement>
@@ -97,7 +100,7 @@ under the License.
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-bom</artifactId>
- <version>${groovy-version}</version>
+ <version>${groovyVersion}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -389,10 +392,6 @@ under the License.
<profiles>
<profile>
<id>run-its</id>
- <properties>
- <!-- plugins versions used in IT tests -->
- <version.maven-site-plugin>3.20.0</version.maven-site-plugin>
- </properties>
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/script-classpath-duplicates/pom.xml
b/src/it/script-classpath-duplicates/pom.xml
index 589db48..04b3a6d 100644
--- a/src/it/script-classpath-duplicates/pom.xml
+++ b/src/it/script-classpath-duplicates/pom.xml
@@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>@groovy-version@</version>
+ <version>@groovyVersion@</version>
<type>pom</type>
<scope>test</scope>
</dependency>
diff --git a/src/site/apt/groovy-version.apt.vm
b/src/site/apt/groovy-version.apt.vm
index 76a1aad..959886c 100644
--- a/src/site/apt/groovy-version.apt.vm
+++ b/src/site/apt/groovy-version.apt.vm
@@ -33,11 +33,11 @@ Groovy version and extensions
Plugin <<<maven-invoker-plugin>>> in version <<<3.4.0>>> has only dependency
on <<<Groovy 4>>> core add common extensions:
- * <<<org.apache.groovy:groovy:${groovy-version}>>>
+ * <<<org.apache.groovy:groovy:${groovyVersion}>>>
- * <<<org.apache.groovy:groovy-json:${groovy-version}>>>
+ * <<<org.apache.groovy:groovy-json:${groovyVersion}>>>
- * <<<org.apache.groovy:groovy-xml:${groovy-version}>>>
+ * <<<org.apache.groovy:groovy-xml:${groovyVersion}>>>
[]
@@ -56,7 +56,7 @@ Groovy version and extensions
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-yaml</artifactId>
- <version>${groovy-version}</version>
+ <version>${groovyVersion}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/src/site/site.xml b/src/site/site.xml
index a0932f7..89bcd9e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
https://maven.apache.org/xsd/decoration-1.8.0.xsd";>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";>
<body>
<menu name="Overview">
@@ -56,4 +56,4 @@ under the License.
</menu>
</body>
-</project>
+</site>
