From b25504554117444d0f887c1eed6d1b3aa92d61c1 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Wed, 24 Jul 2013 10:17:09 -0500
Subject: [PATCH] Enable Jibx binding with TestGroup.CUSTOM_COMPILATION

Previously the Jibx binding was commented out which caused failures when
using the TestGroup.CUSTOM_COMPILATION

Now the Jibx bindings are enabled when the CUSTOM_COMPILATION is enabled.

Issue: SPR-10558
---
 spring-oxm/oxm.gradle | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle
index 6ec966b16c..b467c49f90 100644
--- a/spring-oxm/oxm.gradle
+++ b/spring-oxm/oxm.gradle
@@ -112,20 +112,23 @@ task genXmlbeans {
 
 // add jibx binding to the normal test compilation process
 // INCOMPATIBLE WITH OPENJDK 8 b89+
-// 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/**/*")
-//				}
-//			}
-//		}
-//	}
-// }
+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/**/*")
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file