You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2026/06/17 12:28:37 UTC
(velocity-tools) 01/01: Drop cargo, use Jetty 12
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch VELTOOLS-216/drop-cargo
in repository https://gitbox.apache.org/repos/asf/velocity-tools.git
commit 0367693fc237f0ea96ae3848fa9bff782bec4593
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Wed Jun 17 14:28:24 2026 +0200
Drop cargo, use Jetty 12
---
src/changes/changes.xml | 4 ++
.../velocity-tools-examples-showcase/pom.xml | 70 +++++++---------------
2 files changed, 25 insertions(+), 49 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cff77d24..cfc16dac 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -33,6 +33,10 @@
<action type="fix" dev="cbrisson" due-to="eduarddrenth">
switch 4.x branch from javax to jakarta, bump to jvm 11+
</action>
+ <action type="update" dev="cbrisson">
+ Showcase example integration test now runs on an embedded Jetty 12 (Jakarta EE 10) via
+ jetty-ee10-maven-plugin instead of cargo; running integration tests now requires JDK 17.
+ </action>
</release>
<release version="3.1" date="2021-02-27">
<action type="fix" dev="Jackson Henry">
diff --git a/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml b/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
index e6e86961..b6279329 100644
--- a/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
+++ b/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
@@ -34,6 +34,10 @@
<name>Apache Velocity Tools Examples - Showcase</name>
<description>Showcase of features in Velocity Tools.</description>
+ <properties>
+ <jetty.version>12.1.7</jetty.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
@@ -84,67 +88,35 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven3-plugin</artifactId>
- <version>1.10.12</version>
+ <!-- Embedded Jetty 12 (Jakarta EE 10) serves the webapp for the integration test (requires JDK 17) -->
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
<configuration>
- <container>
- <containerId>jetty11x</containerId>
- </container>
- <configuration>
- <files>
- <copy>
- <file>${project.basedir}/src/main/policy/showcase.policy</file>
- <todir>/</todir>
- <configfile>true</configfile>
- </copy>
- </files>
- <properties>
- <!-- variables referenced in the showcase policy file -->
- <!-- commented since broken on windows due to a cargo bug like MNG-6386
- <cargo.container>${project.build.directory}/cargo/installs</cargo.container>
- <cargo.repository>${settings.localRepository}</cargo.repository>
- <cargo.webapp>${project.build.directory}/${project.artifactId}</cargo.webapp>
- <cargo.velocity-engine.version>${velocity.engine.version}</cargo.velocity-engine.version>
- <cargo.velocity-tools.version>${project.version}</cargo.velocity-tools.version>
- <cargo.slf4j.version>${slf4j.version}</cargo.slf4j.version>
- <cargo.webapp-slf4j-logger.version>${webapp-slf4j-logger.version}</cargo.webapp-slf4j-logger.version>
- -->
- <cargo.jvmargs>
- <!-- enable remote debugging
- -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006
- -->
-
- <!-- enable Jetty debug log
- -Dorg.eclipse.jetty.LEVEL=DEBUG
- -->
-
- <!-- enable security manager
- (disabled for now, see above note about policy file)
- -Djava.security.manager
- -Djava.security.policy=${project.build.directory}/cargo/configurations/jetty9x/showcase.policy
- -->
- </cargo.jvmargs>
- </properties>
- </configuration>
+ <webApp>
+ <contextPath>/velocity-tools-examples-showcase</contextPath>
+ </webApp>
+ <httpConnector>
+ <port>8080</port>
+ </httpConnector>
+ <stopKey>velocity-tools-showcase</stopKey>
+ <stopPort>8090</stopPort>
+ <scan>0</scan>
</configuration>
<executions>
<execution>
- <configuration>
- <wait>false</wait>
- </configuration>
- <id>start-server</id>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
- <phase>pre-integration-test</phase>
</execution>
<execution>
- <id>stop-server</id>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
- <phase>post-integration-test</phase>
</execution>
</executions>
</plugin>