From 830d73b4a7cc046d80068318389891562ed47076 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 3 Jan 2013 11:26:16 +0100
Subject: [PATCH] Eliminate EBR dependencies and repository config

Swap the following EBR-specific dependencies for their equivalents at
Maven Central:

 - atinject-tck
 - jaxb
 - xmlbeans

Remove the /ebr-maven-external repository from the build script entirely
such that all dependencies are now resolved against a single repository:

    http://repo.springsource.org/libs-release
---
 build.gradle          | 3 +--
 spring-oxm/oxm.gradle | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2e2daffb0c3..84c2ce62862 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,6 @@ configure(allprojects) { project ->
 
 	repositories {
 		maven { url "http://repo.springsource.org/libs-release" }
-		maven { url "http://repo.springsource.org/ebr-maven-external" }
 	}
 
 	dependencies {
@@ -332,7 +331,7 @@ project("spring-context") {
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 		testCompile("commons-dbcp:commons-dbcp:1.2.2")
-		testCompile("javax.inject:com.springsource.org.atinject.tck:1.0.0")
+		testCompile("javax.inject:javax.inject-tck:1")
 	}
 
 	test {
diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle
index 9eef5484273..0b8aee62e9d 100644
--- a/spring-oxm/oxm.gradle
+++ b/spring-oxm/oxm.gradle
@@ -7,8 +7,8 @@ configurations {
 dependencies {
 	castor "org.codehaus.castor:castor-anttasks:1.2"
 	castor "velocity:velocity:1.5"
-	xjc "com.sun.xml:com.springsource.com.sun.tools.xjc:2.1.7"
-	xmlbeans "org.apache.xmlbeans:com.springsource.org.apache.xmlbeans:2.4.0"
+	xjc "com.sun.xml.bind:jaxb-xjc:2.1.7"
+	xmlbeans "org.apache.xmlbeans:xmlbeans:2.4.0"
 	jibx "org.jibx:jibx-bind:1.2.3"
 	jibx "bcel:bcel:5.1"
 }