Skip to content

Commit ee5b455

Browse files
committed
Add sandbox to build
Issue gh-610
1 parent d10657f commit ee5b455

File tree

4 files changed

+35
-19
lines changed

4 files changed

+35
-19
lines changed

sandbox/build.gradle

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
plugins {
2-
id
2+
id 'io.spring.convention.spring-module'
33
}
44

55
dependencies {
6+
management platform(project(":spring-ldap-dependencies"))
67
implementation project(":spring-ldap-core")
78

89
provided "com.sun:ldapbp:1.0"
910

10-
testCompile "junit:junit",
11-
"org.mockito:mockito-core",
12-
"gsbase:gsbase",
13-
"org.assertj:assertj-core"
11+
testImplementation platform('org.junit:junit-bom')
12+
testImplementation "org.junit.vintage:junit-vintage-engine"
13+
testImplementation "junit:junit"
14+
testImplementation "org.mockito:mockito-core"
15+
testImplementation "gsbase:gsbase"
16+
testImplementation "org.assertj:assertj-core"
17+
}
18+
19+
compileTestJava {
20+
doFirst {
21+
options.compilerArgs = [
22+
'--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
23+
]
24+
}
25+
}
26+
27+
test {
28+
jvmArgs '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
1429
}

sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
package org.springframework.ldap.control;
1818

19-
import com.sun.jndi.ldap.ctl.VirtualListViewControl;
20-
2119
/**
2220
* Wrapper class for the cookie returned when using the
23-
* {@link VirtualListViewControl}.
21+
* {@link com.sun.jndi.ldap.ctl.VirtualListViewControl}.
2422
*
2523
* @author Ulrik Sandberg
2624
*/

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ include 'dependencies'
2828
include 'test-support'
2929
include 'ldif/ldif-core'
3030
include 'odm'
31-
////include 'sandbox'
31+
include 'sandbox'
3232
include 'test/integration-tests'
3333
//include 'test/integration-tests-spring20'
3434
//include 'test/integration-tests-spring25'
3535
//include 'test/integration-tests-spring30'
3636
include 'test/integration-tests-openldap'
3737
include 'test/integration-tests-sunone'
38-
//include 'test/integration-tests-ad'
38+
include 'test/integration-tests-ad'
3939
//include 'samples/plain'
4040
//include 'samples/odm'
4141

test/integration-tests-ad/build.gradle

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
apply plugin: 'io.spring.convention.spring-test'
22

33
dependencies {
4-
implementation project(":spring-ldap-test"),
5-
project(":spring-ldap-odm"),
6-
project(":spring-ldap-core-tiger")
4+
management platform(project(":spring-ldap-dependencies"))
5+
implementation project(":spring-ldap-test")
6+
implementation project(":spring-ldap-odm")
7+
implementation project(":spring-ldap-core-tiger")
78

8-
provided "org.springframework:spring-jdbc",
9-
"org.springframework:spring-orm"
9+
provided "org.springframework:spring-jdbc"
10+
provided "org.springframework:spring-orm"
1011

11-
testImplementation "org.springframework:spring-test",
12-
"junit:junit",
13-
"org.slf4j:slf4j-log4j12",
14-
"org.assertj:assertj-core"
12+
testImplementation platform('org.junit:junit-bom')
13+
testImplementation "org.junit.vintage:junit-vintage-engine"
14+
testImplementation "org.springframework:spring-test"
15+
testImplementation "junit:junit"
16+
testImplementation "org.slf4j:slf4j-log4j12"
17+
testImplementation "org.assertj:assertj-core"
1518

1619
}
1720

0 commit comments

Comments
 (0)