root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade JiBX (and BCEL) towards support of 1.8 bytecode level 

This commit also drops the now-unused CUSTOM_COMPILATION test group and the outdated JavaVersion class.

Issue: SPR-10423
This commit is contained in:
Juergen Hoeller 2016-07-25 14:10:46 +02:00
parent 0aeb306b6d
commit 01110f678d
8 changed files with 25 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.gradle
View File

@ -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}")

95
spring-core/src/test/java/org/springframework/tests/JavaVersion.java
View File

@ -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;
}
}

9
spring-core/src/test/java/org/springframework/tests/TestGroup.java
View File

@ -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
* <a href="https://jira.spring.io/browse/SPR-10558">SPR-10558</a>
*/
CUSTOM_COMPILATION;
CI;
/**

6
spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
View File

@ -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.<TestGroup> 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<TestGroup> 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));
}
}

7
spring-oxm/oxm.gradle
View File

@ -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"

3
spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
View File

@ -17,11 +17,10 @@
package org.springframework.oxm.jibx;
import java.util.ArrayList;
import java.util.List;
public class Flights {
protected List<FlightType> flightList = new ArrayList<>();
protected ArrayList<FlightType> flightList = new ArrayList<>();
public void addFlight(FlightType flight) {
flightList.add(flight);

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

@ -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 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<JibxMarshaller>
@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

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

@ -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<JibxMarshal
"<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
"<tns:flight><tns:airline>Air Libert\u00e9</tns:airline><tns:number>42</tns:number></tns:flight></tns:flights>";
@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."));
}