diff --git a/build.gradle b/build.gradle index 075d12f01ac..eedd73019a5 100644 --- a/build.gradle +++ b/build.gradle @@ -514,13 +514,6 @@ project("spring-oxm") { description = "Spring Object/XML Marshalling" apply from: "oxm.gradle" - compileTestJava { - // necessary to avoid java.lang.VerifyError on jibx compilation - // see http://jira.codehaus.org/browse/JIBX-465 - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - dependencies { compile(project(":spring-beans")) compile(project(":spring-core")) @@ -539,10 +532,8 @@ project("spring-oxm") { testCompile("org.codehaus.jettison:jettison:1.3.7") { exclude group: 'stax', module: 'stax-api' } - if (compileTestJava.enabled) { - testCompile(files(genCastor.classesDir).builtBy(genCastor)) - testCompile(files(genJaxb.classesDir).builtBy(genJaxb)) - } + testCompile(files(genCastor.classesDir).builtBy(genCastor)) + testCompile(files(genJaxb.classesDir).builtBy(genJaxb)) testRuntime("xerces:xercesImpl:2.11.0") // for Castor testRuntime("javax.xml.bind:jaxb-api:${jaxbVersion}") testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}") diff --git a/spring-core/src/test/java/org/springframework/tests/JavaVersion.java b/spring-core/src/test/java/org/springframework/tests/JavaVersion.java deleted file mode 100644 index ac4e78adeab..00000000000 --- a/spring-core/src/test/java/org/springframework/tests/JavaVersion.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2002-2015 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.tests; - -/** - * Enumeration of known JDK versions. - * - * @author Phillip Webb - * @see #runningVersion() - */ -public enum JavaVersion { - - /** - * Java 1.6 - */ - JAVA_16("1.6", 16), - - /** - * Java 1.7 - */ - JAVA_17("1.7", 17), - - /** - * Java 1.8 - */ - JAVA_18("1.8", 18), - - /** - * Java 1.9 - */ - JAVA_19("1.9", 19); - - - private static final JavaVersion runningVersion = findRunningVersion(); - - private static JavaVersion findRunningVersion() { - String version = System.getProperty("java.version"); - for (JavaVersion candidate : values()) { - if (version.startsWith(candidate.version)) { - return candidate; - } - } - return JavaVersion.JAVA_16; - } - - - private String version; - - private int value; - - - private JavaVersion(String version, int value) { - this.version = version; - this.value = value; - } - - - @Override - public String toString() { - return version; - } - - /** - * Determines if the specified version is the same as or greater than this version. - * @param version the version to check - * @return {@code true} if the specified version is at least this version - */ - public boolean isAtLeast(JavaVersion version) { - return (this.value >= version.value); - } - - /** - * Returns the current running JDK version. If the current version cannot be - * determined {@link #JAVA_16} will be returned. - * @return the JDK version - */ - public static JavaVersion runningVersion() { - return runningVersion; - } - -} diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroup.java b/spring-core/src/test/java/org/springframework/tests/TestGroup.java index d1302963954..6fe51b69498 100644 --- a/spring-core/src/test/java/org/springframework/tests/TestGroup.java +++ b/spring-core/src/test/java/org/springframework/tests/TestGroup.java @@ -58,14 +58,7 @@ public enum TestGroup { /** * Tests that should only be run on the continuous integration server. */ - CI, - - /** - * Tests that require custom compilation beyond that of the standard JDK. This helps to - * allow running tests that will otherwise fail when using JDK > 1.8 b88. See - * SPR-10558 - */ - CUSTOM_COMPILATION; + CI; /** diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java index 8c7d4de47ec..c5c1db9b76d 100644 --- a/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java +++ b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java @@ -38,6 +38,7 @@ public class TestGroupTests { @Rule public ExpectedException thrown = ExpectedException.none(); + @Test public void parseNull() throws Exception { assertThat(TestGroup.parse(null), equalTo(Collections. emptySet())); @@ -65,7 +66,7 @@ public class TestGroupTests { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Unable to find test group 'missing' when parsing " + "testGroups value: 'performance, missing'. Available groups include: " + - "[LONG_RUNNING,PERFORMANCE,JMXMP,CI,CUSTOM_COMPILATION]"); + "[LONG_RUNNING,PERFORMANCE,JMXMP,CI]"); TestGroup.parse("performance, missing"); } @@ -77,9 +78,8 @@ public class TestGroupTests { @Test public void parseAllExcept() throws Exception { Set expected = new HashSet<>(EnumSet.allOf(TestGroup.class)); - expected.remove(TestGroup.CUSTOM_COMPILATION); expected.remove(TestGroup.PERFORMANCE); - assertThat(TestGroup.parse("all-custom_compilation,performance"), equalTo(expected)); + assertThat(TestGroup.parse("all-performance"), equalTo(expected)); } } diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle index 45eb51e4273..472aa0b3c30 100644 --- a/spring-oxm/oxm.gradle +++ b/spring-oxm/oxm.gradle @@ -6,6 +6,7 @@ configurations { dependencies { castor "org.codehaus.castor:castor-anttasks:1.4.1" jibx "org.jibx:jibx-bind:1.2.6" + jibx "org.apache.bcel:bcel:6.0" xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11' xjc 'javax.xml.bind:jaxb-api:2.2.11' xjc 'com.sun.xml.bind:jaxb-core:2.2.11' @@ -91,10 +92,8 @@ task genJaxb { } } -// 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) { +// JiBX compiler is currently not compatible with JDK 9 +if (JavaVersion.current() == JavaVersion.VERSION_1_8) { compileTestJava { def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml" diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java index 9a2ad6f3f7b..f9ddcb70ccb 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java @@ -17,11 +17,10 @@ package org.springframework.oxm.jibx; import java.util.ArrayList; -import java.util.List; public class Flights { - protected List flightList = new ArrayList<>(); + protected ArrayList flightList = new ArrayList<>(); public void addFlight(FlightType flight) { flightList.add(flight); diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java index cfaa50e2caf..79ff5747f77 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +16,17 @@ package org.springframework.oxm.jibx; +import java.io.StringWriter; +import javax.xml.transform.stream.StreamResult; + +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.oxm.AbstractMarshallerTests; -import org.springframework.tests.Assume; -import org.springframework.tests.TestGroup; -import javax.xml.transform.stream.StreamResult; -import java.io.StringWriter; +import org.springframework.oxm.AbstractMarshallerTests; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.xmlunit.matchers.CompareMatcher.isSimilarTo; +import static org.junit.Assert.*; +import static org.xmlunit.matchers.CompareMatcher.*; /** * NOTE: These tests fail under Eclipse/IDEA because JiBX binding does not occur by @@ -41,7 +39,8 @@ public class JibxMarshallerTests extends AbstractMarshallerTests @BeforeClass public static void compilerAssumptions() { - Assume.group(TestGroup.CUSTOM_COMPILATION); + // JiBX compiler is currently not compatible with JDK 9 + Assume.assumeTrue(System.getProperty("java.version").startsWith("1.8.")); } @Override diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java index c6e8c553d0c..03cf555dfb9 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,11 @@ package org.springframework.oxm.jibx; import java.io.ByteArrayInputStream; import javax.xml.transform.stream.StreamSource; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.oxm.AbstractUnmarshallerTests; -import org.springframework.tests.Assume; -import org.springframework.tests.TestGroup; import static org.junit.Assert.*; @@ -41,9 +40,11 @@ public class JibxUnmarshallerTests extends AbstractUnmarshallerTests" + "Air Libert\u00e942"; + @BeforeClass public static void compilerAssumptions() { - Assume.group(TestGroup.CUSTOM_COMPILATION); + // JiBX compiler is currently not compatible with JDK 9 + Assume.assumeTrue(System.getProperty("java.version").startsWith("1.8.")); }