From 9df0c0351216575123c607a39c5c7ec453bae64b Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Tue, 29 Apr 2025 07:55:53 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-11
---
opendj-server-legacy/pom.xml | 93 +++++++++++++++++++++++++++++++---------------
1 files changed, 63 insertions(+), 30 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index b2cb440..b9a9356 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -13,7 +13,7 @@
information: "Portions Copyright [year] [name of copyright owner]".
Copyright 2011-2016 ForgeRock AS.
- Portions Copyright 2017-2024 3A Systems, LLC.
+ Portions Copyright 2017-2025 3A Systems, LLC.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -21,7 +21,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.3-SNAPSHOT</version>
+ <version>4.9.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-legacy</artifactId>
<packaging>jar</packaging>
@@ -65,7 +65,7 @@
<product.archive.name>${product.name.lowercase}-${project.version}</product.archive.name>
<juel.version>2.2.7</juel.version>
-
+
<doclint>none</doclint>
<opendmk.lib.dir>${basedir}/opendmk</opendmk.lib.dir>
</properties>
@@ -86,12 +86,12 @@
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-config</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-cli</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-legacy</artifactId>
@@ -204,7 +204,7 @@
<artifactId>jul-to-slf4j</artifactId>
</dependency>
-
+
<!-- mail -->
<dependency>
<groupId>com.sun.mail</groupId>
@@ -229,7 +229,7 @@
<groupId>org.openidentityplatform.commons.persistit</groupId>
<artifactId>core</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
@@ -246,11 +246,16 @@
<artifactId>juel-api</artifactId>
<version>${juel.version}</version>
</dependency>
-
+
<dependency>
- <groupId>com.datastax.oss</groupId>
+ <groupId>com.datastax.oss</groupId>
+ <artifactId>native-protocol</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
- <version>4.17.0</version>
+ <version>4.19.0</version>
<exclusions>
<exclusion>
<groupId>org.reactivestreams</groupId>
@@ -259,6 +264,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.7.5</version>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
@@ -267,9 +277,50 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>cassandra</artifactId>
- <version>1.19.0</version>
+ <version>1.20.6</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>1.20.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>oracle-free</artifactId>
+ <version>1.20.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mysql</artifactId>
+ <version>1.20.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mssqlserver</artifactId>
+ <version>1.20.6</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- test JDBC drivers -->
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>9.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>23.7.0.25.01</version>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>12.10.0.jre8</version>
+ </dependency>
</dependencies>
<build><finalName>${project.groupId}.${project.artifactId}</finalName>
@@ -1082,24 +1133,6 @@
</executions>
</plugin>
- <!-- Build javadoc -->
- <plugin>
- <groupId>org.openidentityplatform.maven.plugins</groupId>
- <artifactId>javadoc-updater-maven-plugin</artifactId>
- <version>1.0.0</version>
- <executions>
- <execution>
- <phase>site</phase>
- <goals>
- <goal>fixjavadoc</goal>
- </goals>
- <configuration>
- <directory>${project.build.directory}/site/javadoc</directory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- Release project -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1315,7 +1348,7 @@
</sources>
</configuration>
</execution>
-
+
</executions>
</plugin>
--
Gitblit v1.10.0