From 21e31a1199f4095f1ccf74a732b60474deb30d9e Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Thu, 3 Mar 2022 11:33:05 -0700
Subject: [PATCH] Add com.sun.jndi.ldap Module

- Needed for importing com.sun.jndi.ldap in tests
---
 core-tiger/build.gradle             |  4 ++++
 core/build.gradle                   | 10 ++++++++++
 ldif/ldif-core/build.gradle         |  4 ++++
 odm/build.gradle                    |  4 ++++
 samples/boot/build.gradle           |  4 ++++
 samples/odm/build.gradle            |  4 ++++
 samples/plain/build.gradle          |  4 ++++
 sandbox/build.gradle                |  9 +++++++++
 test-support/build.gradle           |  4 ++++
 test/integration-tests/build.gradle |  3 +++
 10 files changed, 50 insertions(+)

diff --git a/core-tiger/build.gradle b/core-tiger/build.gradle
index 6995c7c4..6c9ac20f 100644
--- a/core-tiger/build.gradle
+++ b/core-tiger/build.gradle
@@ -13,3 +13,7 @@ dependencies {
     testImplementation "org.easymock:easymock"
     testImplementation "org.assertj:assertj-core"
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
diff --git a/core/build.gradle b/core/build.gradle
index 84c03f1a..1efcc25e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -44,3 +44,13 @@ dependencies {
     testImplementation "org.assertj:assertj-core"
     testImplementation "com.unboundid:unboundid-ldapsdk"
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+    doFirst {
+        options.compilerArgs = [
+            '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
+        ]
+    }
+}
+
diff --git a/ldif/ldif-core/build.gradle b/ldif/ldif-core/build.gradle
index e42ede08..a372b8ae 100644
--- a/ldif/ldif-core/build.gradle
+++ b/ldif/ldif-core/build.gradle
@@ -17,3 +17,7 @@ dependencies {
         exclude group: 'com.sun.jmx'
     }
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
\ No newline at end of file
diff --git a/odm/build.gradle b/odm/build.gradle
index 48a98931..c9df2b3b 100644
--- a/odm/build.gradle
+++ b/odm/build.gradle
@@ -36,4 +36,8 @@ dependencies {
     testImplementation "org.apache.directory.shared:shared-ldap"
     testImplementation platform('org.junit:junit-bom')
     testImplementation "org.junit.vintage:junit-vintage-engine"
+}
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
 }
\ No newline at end of file
diff --git a/samples/boot/build.gradle b/samples/boot/build.gradle
index b16fa96b..ce4285b0 100644
--- a/samples/boot/build.gradle
+++ b/samples/boot/build.gradle
@@ -18,6 +18,10 @@ dependencies {
 	testImplementation 'org.springframework.security:spring-security-test'
 }
 
+compileTestJava {
+	targetCompatibility = JavaVersion.VERSION_11
+}
+
 tasks.named('test') {
 	useJUnitPlatform()
 }
diff --git a/samples/odm/build.gradle b/samples/odm/build.gradle
index abf88c88..2f392540 100644
--- a/samples/odm/build.gradle
+++ b/samples/odm/build.gradle
@@ -24,3 +24,7 @@ dependencies {
                 "junit:junit",
                 "org.assertj:assertj-core"
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
\ No newline at end of file
diff --git a/samples/plain/build.gradle b/samples/plain/build.gradle
index abf88c88..ebcf1195 100644
--- a/samples/plain/build.gradle
+++ b/samples/plain/build.gradle
@@ -24,3 +24,7 @@ dependencies {
                 "junit:junit",
                 "org.assertj:assertj-core"
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index 5d6f3484..54a11992 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -15,3 +15,12 @@ dependencies {
     testImplementation "gsbase:gsbase"
     testImplementation "org.assertj:assertj-core"
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+    doFirst {
+        options.compilerArgs = [
+                '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
+        ]
+    }
+}
\ No newline at end of file
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 4fbafb80..4cb3e869 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -29,3 +29,7 @@ dependencies {
     testImplementation "org.junit.vintage:junit-vintage-engine"
     testImplementation "org.assertj:assertj-core"
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
\ No newline at end of file
diff --git a/test/integration-tests/build.gradle b/test/integration-tests/build.gradle
index d3f8c7cd..4b46b9a8 100644
--- a/test/integration-tests/build.gradle
+++ b/test/integration-tests/build.gradle
@@ -83,6 +83,9 @@ idea {
     }
 }
 
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
 
 test {
     systemProperties = System.properties