Merge branch 'master' into update-jdk-11

maximthomas

18.34.2025 3608e9e2209a467d9384dd152844c1b55f83373c

 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>