Set maven cargo test with Tomcat 10.1, set Tomcat 11.x for JDK 17 and later

maximthomas

01.14.2025 e86fffdf5818b92f5e1b58ef803285adb9e99cdd

Set maven cargo test with Tomcat 10.1, set Tomcat 11.x for JDK 17 and later

 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>

 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>

 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>
              <maven.cargo.containerId>tomcat11x</maven.cargo.containerId>
          </properties>
        </profile>
        <profile>