Merge branch 'master' into update-jdk-11

maximthomas

18.34.2025 3608e9e2209a467d9384dd152844c1b55f83373c

 opendj-rest2ldap-servlet/pom.xml

@@ -19,7 +19,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-rest2ldap-servlet</artifactId>