From e86fffdf5818b92f5e1b58ef803285adb9e99cdd Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Fri, 01 Aug 2025 11:14:55 +0000
Subject: [PATCH] Set maven cargo test with Tomcat 10.1, set Tomcat 11.x for JDK 17 and later
---
opendj-rest2ldap-servlet/pom.xml | 3 +--
opendj-dsml-servlet/pom.xml | 3 +--
pom.xml | 14 +++++++++++---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 1905b59..d9729db 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -312,7 +312,6 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
- <version>1.10.9</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -332,7 +331,7 @@
</executions>
<configuration>
<container>
- <containerId>tomcat9x</containerId>
+ <containerId>${maven.cargo.containerId}</containerId>
<type>embedded</type>
<systemProperties>
<file.encoding>UTF-8</file.encoding>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index e46d1f4..e5275fc 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
- <version>1.10.9</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -121,7 +120,7 @@
</executions>
<configuration>
<container>
- <containerId>tomcat10x</containerId>
+ <containerId>${maven.cargo.containerId}</containerId>
<type>embedded</type>
<systemProperties>
<file.encoding>UTF-8</file.encoding>
diff --git a/pom.xml b/pom.xml
index c3d118e..efc4a92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
<checkstyleVersion>5.5</checkstyleVersion>
<ant.contrib.version>1.0b3</ant.contrib.version>
<argLine>-Xmx512m</argLine>
+ <maven.cargo.containerId>tomcat10x</maven.cargo.containerId>
<docHomepageUrl>https://doc.openidentityplatform.org/opendj/</docHomepageUrl>
<docWikiUrl>https://github.com/OpenIdentityPlatform/OpenDJ/wiki</docWikiUrl>
@@ -656,6 +657,12 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
+ <version>1.10.20</version>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -675,12 +682,13 @@
</modules>
</profile>
<profile>
- <id>jdk16.options</id>
+ <id>jdk17.options</id>
<activation>
- <jdk>[16,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<properties>
- <argLine>-Xmx512m --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED</argLine>
+ <argLine>-Xmx512m --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED</argLine>
+ <maven.cargo.containerId>tomcat11x</maven.cargo.containerId>
</properties>
</profile>
<profile>
--
Gitblit v1.10.0