File tree Expand file tree Collapse file tree 4 files changed +35
-19
lines changed
src/main/java/org/springframework/ldap/control
test/integration-tests-ad Expand file tree Collapse file tree 4 files changed +35
-19
lines changed Original file line number Diff line number Diff line change 1
1
plugins {
2
- id
2
+ id ' io.spring.convention.spring-module '
3
3
}
4
4
5
5
dependencies {
6
+ management platform(project(" :spring-ldap-dependencies" ))
6
7
implementation project(" :spring-ldap-core" )
7
8
8
9
provided " com.sun:ldapbp:1.0"
9
10
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'
14
29
}
Original file line number Diff line number Diff line change 16
16
17
17
package org .springframework .ldap .control ;
18
18
19
- import com .sun .jndi .ldap .ctl .VirtualListViewControl ;
20
-
21
19
/**
22
20
* Wrapper class for the cookie returned when using the
23
- * {@link VirtualListViewControl}.
21
+ * {@link com.sun.jndi.ldap.ctl. VirtualListViewControl}.
24
22
*
25
23
* @author Ulrik Sandberg
26
24
*/
Original file line number Diff line number Diff line change @@ -28,14 +28,14 @@ include 'dependencies'
28
28
include ' test-support'
29
29
include ' ldif/ldif-core'
30
30
include ' odm'
31
- // // include 'sandbox'
31
+ include ' sandbox'
32
32
include ' test/integration-tests'
33
33
// include 'test/integration-tests-spring20'
34
34
// include 'test/integration-tests-spring25'
35
35
// include 'test/integration-tests-spring30'
36
36
include ' test/integration-tests-openldap'
37
37
include ' test/integration-tests-sunone'
38
- // include 'test/integration-tests-ad'
38
+ include ' test/integration-tests-ad'
39
39
// include 'samples/plain'
40
40
// include 'samples/odm'
41
41
Original file line number Diff line number Diff line change 1
1
apply plugin : ' io.spring.convention.spring-test'
2
2
3
3
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" )
7
8
8
- provided " org.springframework:spring-jdbc" ,
9
- " org.springframework:spring-orm"
9
+ provided " org.springframework:spring-jdbc"
10
+ provided " org.springframework:spring-orm"
10
11
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"
15
18
16
19
}
17
20
You can’t perform that action at this time.
0 commit comments