From 03ec5190f833be16364c9f34ff1357202749b4d2 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Fri, 1 May 2026 15:35:07 +0300
Subject: [PATCH 1/2] Update bouncycastle to 1.84

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d5bd9085d2..99fc7e8fde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
     <logback.version>1.3.15</logback.version>
     <netty.version>4.1.132.Final</netty.version>
     <netty-tcnative-boringssl.version>2.0.69.Final</netty-tcnative-boringssl.version>
-    <bouncycastle.version>1.82</bouncycastle.version>
+    <bouncycastle.version>1.84</bouncycastle.version>
     <javadoc.opts>-Xdoclint:none</javadoc.opts>
     <java.surefire.options>
       -Xmx1g

From 2b36ef96b1726d88f9874ee4e1e8829b8f6ea9a3 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Mon, 4 May 2026 14:47:56 +0300
Subject: [PATCH 2/2] bouncycastle version from commons

---
 bcpkix-shaded/pom.xml | 5 +----
 pom.xml               | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bcpkix-shaded/pom.xml b/bcpkix-shaded/pom.xml
index d72166d0e2..87a8eb5c58 100644
--- a/bcpkix-shaded/pom.xml
+++ b/bcpkix-shaded/pom.xml
@@ -12,7 +12,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 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">
     <modelVersion>4.0.0</modelVersion>
@@ -78,19 +78,16 @@
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
                                     <artifactId>bcpkix-jdk18on</artifactId>
-                                    <version>${bouncycastle.version}</version>
                                     <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
                                     <artifactId>bcutil-jdk18on</artifactId>
-                                    <version>${bouncycastle.version}</version>
                                     <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
                                     <artifactId>bcprov-jdk18on</artifactId>
-                                    <version>${bouncycastle.version}</version>
                                     <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
diff --git a/pom.xml b/pom.xml
index 99fc7e8fde..89add7c339 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <!-- Supress checkstyle errors on legacy com.iplanet and com.sun.identity packages -->
     <checkstyleUnitTestSuppressionsLocation>checkstyle/suppressions.xml</checkstyleUnitTestSuppressionsLocation>
-    <opendj.version>5.1.0</opendj.version>
+    <opendj.version>5.1.1-SNAPSHOT</opendj.version>
     <javadoc-utils.version>1.0.0</javadoc-utils.version>
     <ant.contrib.version>1.0b3</ant.contrib.version>
     <guice.version>7.0.0</guice.version>
@@ -139,7 +139,6 @@
     <logback.version>1.3.15</logback.version>
     <netty.version>4.1.132.Final</netty.version>
     <netty-tcnative-boringssl.version>2.0.69.Final</netty-tcnative-boringssl.version>
-    <bouncycastle.version>1.84</bouncycastle.version>
     <javadoc.opts>-Xdoclint:none</javadoc.opts>
     <java.surefire.options>
       -Xmx1g