From 320fce68c7d1a4a1057555d4e5eb08fba5d27fce Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Thu, 13 Jan 2022 16:08:07 -0700
Subject: [PATCH] Add core to build

Issue gh-610
---
 core/build.gradle                              | 18 +++++++++++++++++-
 .../ldap/control/PagedResultsCookie.java       |  3 +--
 .../PagedResultsDirContextProcessorTest.java   |  6 +++---
 .../RequestControlDirContextProcessorTest.java |  2 +-
 .../SortControlDirContextProcessorTest.java    |  4 ++--
 dependencies/build.gradle                      |  1 +
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0a9bee79..38883026 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -19,6 +19,8 @@ dependencies {
     implementation "org.springframework:spring-tx"
     implementation "org.slf4j:slf4j-api"
 
+    provided "com.sun:ldapbp:1.0"
+
     optional "org.springframework:spring-context"
     optional "org.springframework:spring-jdbc"
     optional "org.springframework:spring-orm"
@@ -28,7 +30,8 @@ dependencies {
     optional "org.apache.commons:commons-pool2"
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
 
-    provided "com.sun:ldapbp:1.0"
+    testImplementation platform('org.junit:junit-bom')
+    testImplementation "org.junit.vintage:junit-vintage-engine"
 
     testImplementation "junit:junit"
     testImplementation "commons-lang:commons-lang"
@@ -37,4 +40,17 @@ dependencies {
     testImplementation "org.mockito:mockito-inline"
     testImplementation "org.springframework:spring-test"
     testImplementation "org.assertj:assertj-core"
+    testImplementation "com.unboundid:unboundid-ldapsdk"
 }
+
+compileTestJava {
+    doFirst {
+        options.compilerArgs = [
+                '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
+        ]
+    }
+}
+
+test {
+    jvmArgs '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
index b86523b6..bfb9e373 100644
--- a/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
+++ b/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
@@ -15,8 +15,7 @@
  */
 package org.springframework.ldap.control;
 
-import com.sun.jndi.ldap.ctl.PagedResultsControl;
-
+import javax.naming.ldap.PagedResultsControl;
 import java.util.Arrays;
 
 /**
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTest.java
index 405976af..210cada4 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTest.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTest.java
@@ -37,7 +37,7 @@ public class PagedResultsDirContextProcessorTest {
 
     private LdapContext ldapContextMock;
 
-	private PagedResultsDirContextProcessor tested;
+    private PagedResultsDirContextProcessor tested;
 
     @Before
     public void setUp() throws Exception {
@@ -101,7 +101,7 @@ public class PagedResultsDirContextProcessorTest {
         byte[] value = new byte[1];
         value[0] = pageSize;
         byte[] cookie = encodeDirSyncValue(resultSize, value);
-        
+
         // Using another response control to verify that it is ignored
         DirSyncResponseControl control = new DirSyncResponseControl(
                 "dummy", true, cookie);
@@ -132,7 +132,7 @@ public class PagedResultsDirContextProcessorTest {
         value[0] = 8;
         int pageSize = 20;
         byte[] cookie = encodeValue(pageSize, value);
-        
+
         BerDecoder ber = new BerDecoder(cookie, 0, cookie.length);
 
         ber.parseSeq(null);
diff --git a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
index 9c3885f6..7b524752 100644
--- a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
+++ b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.ldap.control;
 
-import com.sun.jndi.ldap.ctl.SortControl;
+import javax.naming.ldap.SortControl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
index 44097b20..ac4ff8a8 100644
--- a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
+++ b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
@@ -34,14 +34,14 @@ import static org.mockito.Mockito.when;
 
 /**
  * Unit tests for the SortControlDirContextProcessor class.
- * 
+ *
  * @author Ulrik Sandberg
  */
 public class SortControlDirContextProcessorTest {
 
     private LdapContext ldapContextMock;
 
-	private SortControlDirContextProcessor tested;
+    private SortControlDirContextProcessor tested;
 
     @Before
     public void setUp() throws Exception {
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 044d9103..1a17a507 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -19,6 +19,7 @@ dependencies {
 	api platform("io.rsocket:rsocket-bom:1.1.1")
 	api platform("org.springframework.data:spring-data-bom:2022.1.0-SNAPSHOT")
 	api platform("com.fasterxml.jackson:jackson-bom:2.13.0")
+	api platform("org.junit:junit-bom:5.8.1")
 	constraints {
 		api "com.querydsl:querydsl-core:$queryDslVersion"
 		api "com.querydsl:querydsl-apt:$queryDslVersion"