Skip to content

Commit bb95a63

Browse files
committed
OpenJDK 8 build 99: Jibx compiler fails - ignoring Jibx tests for the time being
1 parent b8f7a30 commit bb95a63

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

spring-oxm/oxm.gradle

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ task genCastor {
3939
castor(types: "j2", warnings: false, file: orderSchema, todir: sourcesDir,
4040
package: "org.springframework.oxm.castor", properties: castorBuilderProperties)
4141

42-
javac(destdir: classesDir, source: 1.5, target: 1.5, debug: true,
42+
javac(destdir: classesDir, source: 1.6, target: 1.6, debug: true,
4343
debugLevel: "lines,vars,source", classpath: configurations.castor.asPath) {
4444
src(path: sourcesDir)
4545
include(name: "**/*.java")
@@ -74,7 +74,7 @@ task genJaxb {
7474
produces(dir: sourcesDir, includes: "**/*.java")
7575
}
7676

77-
javac(destdir: classesDir, source: 1.5, target: 1.5, debug: true,
77+
javac(destdir: classesDir, source: 1.6, target: 1.6, debug: true,
7878
debugLevel: "lines,vars,source",
7979
classpath: configurations.castor.asPath) {
8080
src(path: sourcesDir)
@@ -111,20 +111,21 @@ task genXmlbeans {
111111
}
112112

113113
// add jibx binding to the normal test compilation process
114-
compileTestJava {
115-
def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
116-
117-
doLast() {
118-
project.ant {
119-
taskdef(name: "jibx",
120-
classname: "org.jibx.binding.ant.CompileTask",
121-
classpath: configurations.jibx.asPath)
122-
123-
jibx(verbose: true, load: true, binding: bindingXml) {
124-
classpathset(dir: sourceSets.test.output.classesDir) {
125-
include(name: "**/jibx/**/*")
126-
}
127-
}
128-
}
129-
}
130-
}
114+
// 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+
// }

spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2011 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
2020
import javax.xml.transform.stream.StreamResult;
2121

2222
import org.custommonkey.xmlunit.XMLUnit;
23+
import org.junit.Ignore;
2324
import org.junit.Test;
2425

2526
import org.springframework.oxm.AbstractMarshallerTests;
@@ -35,6 +36,7 @@
3536
* NOTE: These tests fail under Eclipse/IDEA because JiBX binding does
3637
* not occur by default. The Gradle build should succeed, however.
3738
*/
39+
@Ignore("INCOMPATIBLE WITH OPENJDK 8 b89+")
3840
public class JibxMarshallerTests extends AbstractMarshallerTests {
3941

4042
@Override

spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
3333
* NOTE: These tests fail under Eclipse/IDEA because JiBX binding does
3434
* not occur by default. The Gradle build should succeed, however.
3535
*/
36+
@Ignore("INCOMPATIBLE WITH OPENJDK 8 b89+")
3637
public class JibxUnmarshallerTests extends AbstractUnmarshallerTests {
3738

3839
protected static final String INPUT_STRING_WITH_SPECIAL_CHARACTERS =

0 commit comments

Comments
 (0)