Add com.sun.jndi.ldap Module

jzheaux · jzheaux · commit 21e31a1199f4 · 2022-03-03T11:33:05.000-07:00
- Needed for importing com.sun.jndi.ldap in tests
diff --git 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
@@ -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
@@ -17,3 +17,7 @@ dependencies {
         exclude group: 'com.sun.jmx'
     }
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
diff --git 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
 }
diff --git 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
@@ -24,3 +24,7 @@ dependencies {
                 "junit:junit",
                 "org.assertj:assertj-core"
 }
+
+compileTestJava {
+    targetCompatibility = JavaVersion.VERSION_11
+}
diff --git 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
@@ -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'
+        ]
+    }
+}
diff --git 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
+}
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,7 @@ dependencies {`
`13`	`13`	`testImplementation "org.easymock:easymock"`
`14`	`14`	`testImplementation "org.assertj:assertj-core"`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+compileTestJava {`
	`18`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,7 @@ dependencies {`
`17`	`17`	`exclude group: 'com.sun.jmx'`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+compileTestJava {`
	`22`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,8 @@ dependencies {`
`36`	`36`	`testImplementation "org.apache.directory.shared:shared-ldap"`
`37`	`37`	`testImplementation platform('org.junit:junit-bom')`
`38`	`38`	`testImplementation "org.junit.vintage:junit-vintage-engine"`
	`39`	`+}`
	`40`	`+`
	`41`	`+compileTestJava {`
	`42`	`+ targetCompatibility = JavaVersion.VERSION_11`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@ dependencies {`
`18`	`18`	`testImplementation 'org.springframework.security:spring-security-test'`
`19`	`19`	`}`
`20`	`20`
	`21`	`+compileTestJava {`
	`22`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`23`	`+}`
	`24`	`+`
`21`	`25`	`tasks.named('test') {`
`22`	`26`	`useJUnitPlatform()`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,3 +24,7 @@ dependencies {`
`24`	`24`	`"junit:junit",`
`25`	`25`	`"org.assertj:assertj-core"`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+compileTestJava {`
	`29`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,7 @@ dependencies {`
`29`	`29`	`testImplementation "org.junit.vintage:junit-vintage-engine"`
`30`	`30`	`testImplementation "org.assertj:assertj-core"`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+compileTestJava {`
	`34`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@ idea {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
	`86`	`+compileTestJava {`
	`87`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`88`	`+}`
`86`	`89`
`87`	`90`	`test {`
`88`	`91`	`systemProperties = System.properties`