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

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

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

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

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