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

Author: maximthomas

commons/auth-filters/authz-filter/framework-functional-tests/pom.xml

@@ -32,6 +32,7 @@
     <properties>
         <hostname>localhost</hostname>
         <context.uri>framework</context.uri>
+        <maven.cargo.containerId>tomcat10x</maven.cargo.containerId>
     </properties>
 
     <build>
@@ -96,7 +97,7 @@
                 <configuration>
                     <!-- Container configuration -->
                     <container>
-                        <containerId>tomcat10x</containerId>
+                        <containerId>${maven.cargo.containerId}</containerId>
                     </container>
                     <!-- Configuration to use with the container or the deployer -->
                     <configuration>
@@ -189,4 +190,15 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>jdk17.options</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <properties>
+                <maven.cargo.containerId>tomcat11x</maven.cargo.containerId>
+            </properties>
+        </profile>
+    </profiles>
 </project>

pom.xml

@@ -935,7 +935,7 @@
                 <plugin>
                     <groupId>org.codehaus.cargo</groupId>
                     <artifactId>cargo-maven3-plugin</artifactId>
-                    <version>1.9.8</version>
+                    <version>1.10.20</version>
                 </plugin>
                 <plugin>
                     <groupId>org.openidentityplatform.commons</groupId>