Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[MINVOKER-373] Switch to Doxia 2 #263

Merged
merged 1 commit into from
Nov 17, 2024
Merged

[MINVOKER-373] Switch to Doxia 2 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/it/script-classpath-duplicates/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/site/apt/groovy-version.apt.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}>>>

[]

Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -56,4 +56,4 @@ under the License.
</menu>

</body>
</project>
</site>