From f25db7bc6eab263f17ace0d6b7deb9e8e7acf409 Mon Sep 17 00:00:00 2001
From: Maxim Thomas <maxim.thomas@gmail.com>
Date: Thu, 18 Sep 2025 08:14:31 +0000
Subject: [PATCH] Update target JDK to 11 and move to JakartaEE 9 (#532)

---
 opendj-dsml-servlet/pom.xml |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 98fe29c..d9729db 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.openidentityplatform.opendj</groupId>
         <artifactId>opendj-parent</artifactId>
-        <version>4.10.3-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>opendj-dsml-servlet</artifactId>
@@ -39,9 +39,8 @@
     <dependencies>
     	<!-- Servlet API -->
         <dependency>
-      		<groupId>javax.servlet</groupId>
-      		<artifactId>javax.servlet-api</artifactId>
-      		<version>3.1.0</version>
+      		<groupId>jakarta.servlet</groupId>
+      		<artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
     	</dependency>
 
@@ -83,7 +82,7 @@
         <dependency>
         	<groupId>com.sun.xml.ws</groupId>
 		    <artifactId>jaxws-ri</artifactId>
-		    <version>2.3.7</version>
+		    <version>4.0.3</version>
 		    <type>pom</type>
         </dependency>
 
@@ -313,7 +312,6 @@
             <plugin>
 		      <groupId>org.codehaus.cargo</groupId>
 	          <artifactId>cargo-maven3-plugin</artifactId>
-	          <version>1.10.9</version>
 	          <extensions>true</extensions>
 			  <executions>
 				    <execution>
@@ -333,7 +331,7 @@
 				</executions>
 	            <configuration>
 	                <container>
-	                    <containerId>tomcat9x</containerId>
+                        <containerId>${maven.cargo.containerId}</containerId>
 	                    <type>embedded</type>
 	                    <systemProperties>
 	                        <file.encoding>UTF-8</file.encoding>

--
Gitblit v1.10.0