summaryrefslogtreecommitdiff
path: root/spring-oxm/oxm.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'spring-oxm/oxm.gradle')
-rw-r--r--spring-oxm/oxm.gradle34
1 files changed, 14 insertions, 20 deletions
diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle
index 140b3513..f232e897 100644
--- a/spring-oxm/oxm.gradle
+++ b/spring-oxm/oxm.gradle
@@ -6,11 +6,10 @@ configurations {
}
dependencies {
castor "org.codehaus.castor:castor-anttasks:1.4.1"
- castor "org.apache.velocity:velocity:1.7"
+ jibx "org.jibx:jibx-bind:1.2.6"
+ jibx "org.apache.bcel:bcel:6.0"
xjc "com.sun.xml.bind:jaxb-xjc:2.1.17"
xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0"
- jibx "org.jibx:jibx-bind:1.2.6"
- jibx "bcel:bcel:5.1"
}
ext.genSourcesDir = "${buildDir}/generated-sources"
@@ -110,23 +109,18 @@ task genXmlbeans {
}
}
-// add jibx binding to the normal test compilation process
-// INCOMPATIBLE WITH OPENJDK 8 b89+
-def jibxEnabled = project.properties.get("testGroups")?.toLowerCase()?.split(",")?.contains("custom_compilation")
-if (jibxEnabled) {
- compileTestJava {
- def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
-
- doLast() {
- project.ant {
- taskdef(name: "jibx",
- classname: "org.jibx.binding.ant.CompileTask",
- classpath: configurations.jibx.asPath)
-
- jibx(verbose: true, load: true, binding: bindingXml) {
- classpathset(dir: sourceSets.test.output.classesDir) {
- include(name: "**/jibx/**/*")
- }
+compileTestJava {
+ def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
+
+ doLast() {
+ project.ant {
+ taskdef(name: "jibx",
+ classname: "org.jibx.binding.ant.CompileTask",
+ classpath: configurations.jibx.asPath)
+
+ jibx(verbose: true, load: true, binding: bindingXml) {
+ classpathset(dir: sourceSets.test.output.classesDir) {
+ include(name: "**/jibx/**/*")
}
}
}