From 8ab1c0a3ead8fe835cebbd7fecfca1d83da08fd0 Mon Sep 17 00:00:00 2001
From: Kcchouette <Kcchouette@users.noreply.github.com>
Date: Fri, 28 Aug 2026 13:52:18 +0200
Subject: [PATCH 1/5] Add dependency for Berkeley DB Java Edition

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 1f7e2cbc..f3ad0c5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -772,6 +772,14 @@
       <version>2.6.4</version>
       <scope>compile</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.sleepycat</groupId>
+      <artifactId>je</artifactId>
+      <version>5.0.73</version>
+      <type>jar</type>
+      <optional>false</optional>
+    </dependency>
  
    <dependency>
       <groupId>org.mybatis</groupId>

From e663bcb286ea09142577840118446c405e561b24 Mon Sep 17 00:00:00 2001
From: Kcchouette <Kcchouette@users.noreply.github.com>
Date: Fri, 28 Aug 2026 13:53:33 +0200
Subject: [PATCH 2/5] Update dependency exclusions and includes in dist.xml

---
 src/main/assembly/dist.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/assembly/dist.xml b/src/main/assembly/dist.xml
index 2b7e69ab..1774298e 100644
--- a/src/main/assembly/dist.xml
+++ b/src/main/assembly/dist.xml
@@ -200,7 +200,8 @@
 			<outputDirectory>lib</outputDirectory>
 			<excludes>
 				<exclude>junit:junit</exclude>
-				<exclude>org.forgerock.opendj:opendj-server</exclude>
+				<exclude>org.forgerock.ce.opendj:opendj-server</exclude>
+				<exclude>com.sleepycat:je</exclude>
 				<exclude>postgresql:postgresql</exclude>
 			</excludes>
 			<fileMode>0644</fileMode>
@@ -209,7 +210,8 @@
 		<dependencySet>
 			<outputDirectory>sample/lib</outputDirectory>
 			<includes>
-				<include>org.forgerock.opendj:opendj-server</include>
+				<include>org.forgerock.ce.opendj:opendj-server</include>
+				<include>com.sleepycat:je</include>
 				<include>postgresql:postgresql</include>
 				<!-- see also the tests jar included in a fileSet above -->
 			</includes>

From eb69ceed5165c4e976d10af018f1d8829bec4816 Mon Sep 17 00:00:00 2001
From: Kcchouette <Kcchouette@users.noreply.github.com>
Date: Fri, 28 Aug 2026 13:55:59 +0200
Subject: [PATCH 3/5] Add sample library directory for HSQLDB

---
 sample/hsqldb/bin/lsc-sample | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sample/hsqldb/bin/lsc-sample b/sample/hsqldb/bin/lsc-sample
index 3f9ab5a9..b2dd0ee0 100755
--- a/sample/hsqldb/bin/lsc-sample
+++ b/sample/hsqldb/bin/lsc-sample
@@ -60,10 +60,12 @@ fi
 CONFIGPATH="${SAMPLE_HOME}/etc"
 
 LSC_LIB_DIR="${SAMPLE_HOME}/../../lib"
+LSC_SAMPLE_LIB_DIR="${SAMPLE_HOME}/../lib"
 LSC_BIN_DIR="${SAMPLE_HOME}/../../bin"
 
 # HSQLDB jar file
 [ -z "$HSQLDB_LIB" -a -e "${LSC_LIB_DIR}"/hsqldb*.jar ] && HSQLDB_LIB=$( readlink -f "${LSC_LIB_DIR}"/hsqldb*.jar )
+[ -z "$HSQLDB_LIB" -a -e "${LSC_SAMPLE_LIB_DIR}"/hsqldb*.jar ] && HSQLDB_LIB=$( readlink -f "${LSC_SAMPLE_LIB_DIR}"/hsqldb*.jar )
 [ -z "$HSQLDB_LIB" ] && echo "hsqldb driver (hsqldb*.jar) is missing" && exit 1
 # Temporary directory so that HSQLDB server could store files
 HSQLDB_DIR="/tmp/lsc/hsqldb"
@@ -217,14 +219,17 @@ run_java_command()
 	# check if we have java executable
 	get_java
 
-	for jar in "${LSC_LIB_DIR}"/*.jar; do
-		LDAPCP="$LDAPCP:$jar"
+	for jar in "${LSC_LIB_DIR}"/*.jar "${LSC_SAMPLE_LIB_DIR}"/*.jar; do
+		[ -e "$jar" ] && LDAPCP="$LDAPCP:$jar"
 	done
 
 	"${JAVA_COMMAND}" \
 		-cp "$LDAPCP" \
 		--add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
-		--add-exports java.base/sun.security.x509=ALL-UNNAMED $1
+		--add-exports java.base/sun.security.x509=ALL-UNNAMED \
+		--add-opens java.base/java.lang=ALL-UNNAMED \
+		--add-opens java.base/java.util=ALL-UNNAMED \
+		--add-opens java.base/sun.security.x509=ALL-UNNAMED $1
 }
 
 start_ldap() {

From 3c788302a9b940cb6a83728265e7979ec55fb65a Mon Sep 17 00:00:00 2001
From: Kcchouette <Kcchouette@users.noreply.github.com>
Date: Fri, 28 Aug 2026 13:57:54 +0200
Subject: [PATCH 4/5] Enhance lsc-sample script with additional library paths

---
 sample/ldap2hsqldb/bin/lsc-sample | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sample/ldap2hsqldb/bin/lsc-sample b/sample/ldap2hsqldb/bin/lsc-sample
index c5ca42b7..5ac571ec 100755
--- a/sample/ldap2hsqldb/bin/lsc-sample
+++ b/sample/ldap2hsqldb/bin/lsc-sample
@@ -60,10 +60,12 @@ fi
 CONFIGPATH="${SAMPLE_HOME}/etc"
 
 LSC_LIB_DIR="${SAMPLE_HOME}/../../lib"
+LSC_SAMPLE_LIB_DIR="${SAMPLE_HOME}/../lib"
 LSC_BIN_DIR="${SAMPLE_HOME}/../../bin"
 
 # HSQLDB jar file
 [ -z "$HSQLDB_LIB" -a -e "${LSC_LIB_DIR}"/hsqldb*.jar ] && HSQLDB_LIB=$( readlink -f "${LSC_LIB_DIR}"/hsqldb*.jar )
+[ -z "$HSQLDB_LIB" -a -e "${LSC_SAMPLE_LIB_DIR}"/hsqldb*.jar ] && HSQLDB_LIB=$( readlink -f "${LSC_SAMPLE_LIB_DIR}"/hsqldb*.jar )
 [ -z "$HSQLDB_LIB" ] && echo "hsqldb driver (hsqldb*.jar) is missing" && exit 1
 # Temporary directory so that HSQLDB server could store files
 HSQLDB_DIR=/tmp/lsc/hsqldb
@@ -163,14 +165,17 @@ run_java_command()
         # check if we have java executable
         get_java
 
-        for jar in "${LSC_LIB_DIR}"/*.jar; do
-                LDAPCP="$LDAPCP:$jar"
+        for jar in "${LSC_LIB_DIR}"/*.jar "${LSC_SAMPLE_LIB_DIR}"/*.jar; do
+                [ -e "$jar" ] && LDAPCP="$LDAPCP:$jar"
         done
 
         "${JAVA_COMMAND}" \
                 -cp "$LDAPCP" \
                 --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
-                --add-exports java.base/sun.security.x509=ALL-UNNAMED $1 $2 $3 $4 $5
+                --add-exports java.base/sun.security.x509=ALL-UNNAMED \
+				--add-opens java.base/java.lang=ALL-UNNAMED \
+				--add-opens java.base/java.util=ALL-UNNAMED \
+				--add-opens java.base/sun.security.x509=ALL-UNNAMED $1 $2 $3 $4 $5
 }
 
 start_ldap() {
@@ -247,7 +252,7 @@ case "$1" in
 	;;
   "--stop-hsql-server")
     ACTIONS="$ACTIONS stophsql"
-!	shift
+	shift
 	;;
   "--run")
 	run LDAP2JDBCTask LDAP2JDBCTask

From 0426824ab67b3dc7568ef416b3ea7b9b67aac280 Mon Sep 17 00:00:00 2001
From: Kcchouette <Kcchouette@users.noreply.github.com>
Date: Mon, 31 Aug 2026 08:37:08 +0000
Subject: [PATCH 5/5] Update je dependency version and scope in pom.xml

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3ad0c5c..8a601312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -776,9 +776,8 @@
     <dependency>
       <groupId>com.sleepycat</groupId>
       <artifactId>je</artifactId>
-      <version>5.0.73</version>
-      <type>jar</type>
-      <optional>false</optional>
+      <version>18.3.12</version>
+      <scope>compile</scope>
     </dependency>
  
    <dependency>