Skip to content

Commit b255045

Browse files
committed
Enable Jibx binding with TestGroup.CUSTOM_COMPILATION
Previously the Jibx binding was commented out which caused failures when using the TestGroup.CUSTOM_COMPILATION Now the Jibx bindings are enabled when the CUSTOM_COMPILATION is enabled. Issue: SPR-10558
1 parent f7c0795 commit b255045

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

spring-oxm/oxm.gradle

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,23 @@ task genXmlbeans {
112112

113113
// add jibx binding to the normal test compilation process
114114
// INCOMPATIBLE WITH OPENJDK 8 b89+
115-
// compileTestJava {
116-
// def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
117-
//
118-
// doLast() {
119-
// project.ant {
120-
// taskdef(name: "jibx",
121-
// classname: "org.jibx.binding.ant.CompileTask",
122-
// classpath: configurations.jibx.asPath)
123-
//
124-
// jibx(verbose: true, load: true, binding: bindingXml) {
125-
// classpathset(dir: sourceSets.test.output.classesDir) {
126-
// include(name: "**/jibx/**/*")
127-
// }
128-
// }
129-
// }
130-
// }
131-
// }
115+
def jibxEnabled = project.properties.get("testGroups")?.toLowerCase()?.split(",")?.contains("custom_compilation")
116+
if(jibxEnabled) {
117+
compileTestJava {
118+
def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
119+
120+
doLast() {
121+
project.ant {
122+
taskdef(name: "jibx",
123+
classname: "org.jibx.binding.ant.CompileTask",
124+
classpath: configurations.jibx.asPath)
125+
126+
jibx(verbose: true, load: true, binding: bindingXml) {
127+
classpathset(dir: sourceSets.test.output.classesDir) {
128+
include(name: "**/jibx/**/*")
129+
}
130+
}
131+
}
132+
}
133+
}
134+
}

0 commit comments

Comments
 (0)