From 3608e9e2209a467d9384dd152844c1b55f83373c Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Fri, 18 Jul 2025 08:34:36 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-11

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

diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 4224925..423f222 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.9.5-SNAPSHOT</version>
+        <version>4.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>opendj-dsml-servlet</artifactId>
@@ -41,7 +41,6 @@
         <dependency>
       		<groupId>jakarta.servlet</groupId>
       		<artifactId>jakarta.servlet-api</artifactId>
-      		<version>6.0.0</version>
             <scope>provided</scope>
     	</dependency>
 
@@ -79,24 +78,24 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
         	<groupId>com.sun.xml.ws</groupId>
 		    <artifactId>jaxws-ri</artifactId>
 		    <version>4.0.3</version>
 		    <type>pom</type>
         </dependency>
-        
+
         <dependency>
 		    <groupId>jakarta.xml.bind</groupId>
 		    <artifactId>jakarta.xml.bind-api</artifactId>
 		    <version>3.0.1</version>
 		</dependency>
-		
+
 		<dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.5</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

--
Gitblit v1.10.0