From ee5b45506c09d769852bead0f412ed9f00f5dc07 Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Wed, 12 Jan 2022 11:58:54 -0700
Subject: [PATCH] Add sandbox to build

Issue gh-610
---
 sandbox/build.gradle                          | 25 +++++++++++++++----
 .../control/VirtualListViewResultsCookie.java |  4 +--
 settings.gradle                               |  4 +--
 test/integration-tests-ad/build.gradle        | 21 +++++++++-------
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index cbfa7dca..aa68789d 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -1,14 +1,29 @@
 plugins {
-    id
+    id 'io.spring.convention.spring-module'
 }
 
 dependencies {
+    management platform(project(":spring-ldap-dependencies"))
     implementation project(":spring-ldap-core")
 
     provided "com.sun:ldapbp:1.0"
 
-    testCompile "junit:junit",
-                "org.mockito:mockito-core",
-                "gsbase:gsbase",
-                "org.assertj:assertj-core"
+    testImplementation platform('org.junit:junit-bom')
+    testImplementation "org.junit.vintage:junit-vintage-engine"
+    testImplementation "junit:junit"
+    testImplementation "org.mockito:mockito-core"
+    testImplementation "gsbase:gsbase"
+    testImplementation "org.assertj:assertj-core"
+}
+
+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'
 }
diff --git a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
index cfcf34b6..68519e7a 100644
--- a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
@@ -16,11 +16,9 @@
 
 package org.springframework.ldap.control;
 
-import com.sun.jndi.ldap.ctl.VirtualListViewControl;
-
 /**
  * Wrapper class for the cookie returned when using the
- * {@link VirtualListViewControl}.
+ * {@link com.sun.jndi.ldap.ctl.VirtualListViewControl}.
  * 
  * @author Ulrik Sandberg
  */
diff --git a/settings.gradle b/settings.gradle
index 35ee67ba..4bff47c9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,14 +28,14 @@ include 'dependencies'
 include 'test-support'
 include 'ldif/ldif-core'
 include 'odm'
-////include 'sandbox'
+include 'sandbox'
 include 'test/integration-tests'
 //include 'test/integration-tests-spring20'
 //include 'test/integration-tests-spring25'
 //include 'test/integration-tests-spring30'
 include 'test/integration-tests-openldap'
 include 'test/integration-tests-sunone'
-//include 'test/integration-tests-ad'
+include 'test/integration-tests-ad'
 //include 'samples/plain'
 //include 'samples/odm'
 
diff --git a/test/integration-tests-ad/build.gradle b/test/integration-tests-ad/build.gradle
index b35213ca..ace7acce 100644
--- a/test/integration-tests-ad/build.gradle
+++ b/test/integration-tests-ad/build.gradle
@@ -1,17 +1,20 @@
 apply plugin: 'io.spring.convention.spring-test'
 
 dependencies {
-    implementation 	project(":spring-ldap-test"),
-                project(":spring-ldap-odm"),
-                project(":spring-ldap-core-tiger")
+    management platform(project(":spring-ldap-dependencies"))
+    implementation project(":spring-ldap-test")
+    implementation project(":spring-ldap-odm")
+    implementation project(":spring-ldap-core-tiger")
 
-    provided	"org.springframework:spring-jdbc",
-                "org.springframework:spring-orm"
+    provided "org.springframework:spring-jdbc"
+    provided "org.springframework:spring-orm"
 
-    testImplementation "org.springframework:spring-test",
-                "junit:junit",
-                "org.slf4j:slf4j-log4j12",
-                "org.assertj:assertj-core"
+    testImplementation platform('org.junit:junit-bom')
+    testImplementation "org.junit.vintage:junit-vintage-engine"
+    testImplementation "org.springframework:spring-test"
+    testImplementation "junit:junit"
+    testImplementation "org.slf4j:slf4j-log4j12"
+    testImplementation "org.assertj:assertj-core"
 
 }