From da3e8611e11205aed88da5841a0edfcfe9dfb4ab Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Mon, 25 Jul 2016 13:08:46 +0200
Subject: [PATCH] Upgrade JiBX (and BCEL) towards support of 1.8 bytecode level

Issue: SPR-10423
---
 build.gradle                                  | 15 ++--------
 spring-oxm/oxm.gradle                         | 30 ++++++++-----------
 .../org/springframework/oxm/jibx/Flights.java |  3 +-
 .../org/springframework/oxm/jibx/binding.xml  |  4 +--
 4 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/build.gradle b/build.gradle
index b07e7c77496..c896d255cbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -556,13 +556,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.6
-		targetCompatibility = 1.6
-	}
-
 	dependencies {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
@@ -584,11 +577,9 @@ 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(genXmlbeans.classesDir).builtBy(genXmlbeans))
-		}
+		testCompile(files(genCastor.classesDir).builtBy(genCastor))
+		testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
+		testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans))
 	}
 }
 
diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle
index 23ce60ffd99..f232e8972ce 100644
--- a/spring-oxm/oxm.gradle
+++ b/spring-oxm/oxm.gradle
@@ -7,6 +7,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.1.17"
 	xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0"
 }
@@ -108,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/**/*")
 				}
 			}
 		}
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 f44e14c8310..c12ca200e97 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<FlightType> flightList = new ArrayList<FlightType>();
+	protected ArrayList<FlightType> flightList = new ArrayList<FlightType>();
 
 	public void addFlight(FlightType flight) {
 		flightList.add(flight);
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml b/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml
index 2f8cc0ad924..0124a36d24d 100644
--- a/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <binding>
     <mapping name="flights" class="org.springframework.oxm.jibx.Flights">
-        <namespace uri="http://samples.springframework.org/flight" default="elements"/>
+        <namespace uri="http://www.springframework.org/flight" default="elements"/>
         <collection field="flightList">
             <structure map-as="org.springframework.oxm.jibx.FlightType"/>
         </collection>
     </mapping>
     <mapping name="flight" class="org.springframework.oxm.jibx.FlightType">
-        <namespace uri="http://samples.springframework.org/flight" default="elements"/>
+        <namespace uri="http://www.springframework.org/flight" default="elements"/>
         <value name="airline" field="airline" usage="optional"/>
         <value name="number" field="number" usage="required"/>
     </mapping>