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)
---
pom.xml | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1eb96b3..efc4a92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.10.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Services Project</name>
@@ -35,11 +35,11 @@
<product.locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</product.locales>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<localized.jars.classifier>i18n</localized.jars.classifier>
- <commons.version>2.4.1</commons.version>
+ <commons.version>3.0.0-SNAPSHOT</commons.version>
<freemarker.version>2.3.34</freemarker.version>
<metrics-core.version>4.2.30</metrics-core.version>
- <maven.compiler.target>8</maven.compiler.target>
- <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
<!--
@@ -57,6 +57,7 @@
<checkstyleVersion>5.5</checkstyleVersion>
<ant.contrib.version>1.0b3</ant.contrib.version>
<argLine>-Xmx512m</argLine>
+ <maven.cargo.containerId>tomcat10x</maven.cargo.containerId>
<docHomepageUrl>https://doc.openidentityplatform.org/opendj/</docHomepageUrl>
<docWikiUrl>https://github.com/OpenIdentityPlatform/OpenDJ/wiki</docWikiUrl>
@@ -149,10 +150,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+
<dependency>
- <groupId>com.github.stephenc.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- <version>1.0-1</version>
+ <groupId>com.io7m.jcip</groupId>
+ <artifactId>com.io7m.jcip.annotations</artifactId>
+ <version>2.0.0</version>
</dependency>
<!-- OpenDJ SDK -->
@@ -334,6 +336,10 @@
<fork>true</fork>
<compilerArgs>
<arg>-XDignore.symbol.file</arg>
+ <arg>--add-exports</arg>
+ <arg>java.base/sun.security.x509=ALL-UNNAMED</arg>
+ <arg>--add-exports</arg>
+ <arg>java.base/sun.security.tools.keytool=ALL-UNNAMED</arg>
</compilerArgs>
</configuration>
</plugin>
@@ -651,6 +657,12 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
+ <version>1.10.20</version>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -669,22 +681,14 @@
<module>opendj-packages</module>
</modules>
</profile>
- <profile>
- <id>set-compiler-release</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <maven.compiler.release>8</maven.compiler.release>
- </properties>
- </profile>
<profile>
- <id>jdk16.options</id>
+ <id>jdk17.options</id>
<activation>
- <jdk>[16,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<properties>
- <argLine>-Xmx512m --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED</argLine>
+ <argLine>-Xmx512m --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.naming/javax.naming.spi=ALL-UNNAMED</argLine>
+ <maven.cargo.containerId>tomcat11x</maven.cargo.containerId>
</properties>
</profile>
<profile>
--
Gitblit v1.10.0