From b12312114af46c640d843b444beb8efaf6c3cf72 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@gopivotal.com>
Date: Wed, 12 Mar 2014 16:47:27 +0200
Subject: [PATCH] INT-3320: Update Dependencies

JIRA: https://jira.spring.io/browse/INT-3320
---
 build.gradle | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1eb59ae7f2..dfc9a5d852 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,26 +59,27 @@ subprojects { subproject ->
 
 	ext {
 		activeMqVersion = '5.9.0'
-		aspectjVersion = '1.7.4'
-		apacheSshdVersion = '0.10.0'
+		aspectjVersion = '1.8.0.M1'
+		apacheSshdVersion = '0.10.1'
 		commonsDbcpVersion = '1.4'
 		commonsIoVersion = '2.4'
 		commonsNetVersion = '3.3'
+		httpClientVersion = '3.1'
 		derbyVersion = '10.10.1.1'
-		eclipseLinkVersion = '2.5.1'
+		eclipseLinkVersion = '2.4.2'
 		ftpServerVersion = '1.0.6'
-		groovyVersion = '2.2.1'
+		groovyVersion = '2.2.2'
 		guavaVersion = '16.0.1'
 		hamcrestVersion = '1.3'
-		hibernateVersion = '4.3.1.Final'
+		hibernateVersion = '4.2.10.Final'
 		hsqldbVersion = '2.3.2'
 		h2Version = '1.3.175'
 		jacksonVersion = '1.9.13'
-		jackson2Version = '2.3.1'
+		jackson2Version = '2.3.2'
 		javaxActivationVersion = '1.1.1'
 		javaxMailVersion = '1.4.7'
-		jmsSpecVersion = '1.1.1'
-		jpa21ApiVersion = '1.0.0.Final'
+		jmsApiVersion = '1.1-rev-1'
+		jpaApiVersion = '2.0.0'
 		jrubyVersion = '1.7.8'
 		jschVersion = '0.1.50'
 		jsonpathVersion = '0.9.1'
@@ -106,7 +107,6 @@ subprojects { subproject ->
 		springRetryVersion = '1.0.3.RELEASE'
 		springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.2.RELEASE'
 		springWsVersion = '2.1.1.RELEASE'
-		staxApiVersion = '1.0.1'
 		xmlUnitVersion = '1.5'
 		xstreamVersion = '1.4.7'
 	}
@@ -308,12 +308,7 @@ project('spring-integration-http') {
 
 		compile("javax.servlet:javax.servlet-api:$servletApiVersion", provided)
 
-		compile("net.java.dev.rome:rome-fetcher:$romeVersion") { dep ->
-			optional dep
-			exclude group: 'junit', module: 'junit'
-		}
-		compile ("net.java.dev.rome:rome:$romeVersion", optional)
-
+		testCompile "commons-httpclient:commons-httpclient:$httpClientVersion"
 	}
 
 	// suppress deprecation warnings (@SuppressWarnings("deprecation") is not enough for javac)
@@ -366,7 +361,7 @@ project('spring-integration-jms') {
 		compile project(":spring-integration-core")
 		compile "org.springframework:spring-jms:$springVersion"
 		compile "org.springframework:spring-tx:$springVersion"
-		compile ("org.apache.geronimo.specs:geronimo-jms_1.1_spec:$jmsSpecVersion", provided)
+		compile ("javax.jms:jms-api:$jmsApiVersion", provided)
 		testCompile("org.apache.activemq:activemq-broker:$activeMqVersion")
 		testCompile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") {
 			exclude group: "org.springframework"
@@ -391,13 +386,14 @@ project('spring-integration-jpa') {
 		compile "org.springframework:spring-aop:$springVersion"
 		compile "org.springframework:spring-orm:$springVersion"
 		compile "org.springframework:spring-tx:$springVersion"
-		compile "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion"
+		compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion"
 
 		testCompile "com.h2database:h2:$h2Version"
 		testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
 		testCompile "org.apache.derby:derby:$derbyVersion"
 
 		testCompile "org.hibernate:hibernate-entitymanager:$hibernateVersion"
+
 		testCompile ("org.apache.openjpa:openjpa:$openJpaVersion") {
 			exclude group: 'org.apache.geronimo.specs'
 		}
@@ -570,7 +566,6 @@ project('spring-integration-ws') {
 		}
 		compile("com.sun.xml.messaging.saaj:saaj-impl:$saajImplVersion", optional)
 		compile("javax.activation:activation:$javaxActivationVersion", optional)
-		testCompile "stax:stax-api:$staxApiVersion"
 		testCompile "com.thoughtworks.xstream:xstream:$xstreamVersion"
 		testCompile ("org.springframework.ws:spring-ws-support:$springWsVersion") {
 			exclude group: 'org.springframework'
@@ -578,7 +573,7 @@ project('spring-integration-ws') {
 		testCompile ("org.springframework:spring-jms:$springVersion") {
 			exclude group: 'org.springframework'
 		}
-		testCompile "org.apache.geronimo.specs:geronimo-jms_1.1_spec:$jmsSpecVersion"
+		testCompile "javax.jms:jms-api:$jmsApiVersion"
 		testCompile "org.igniterealtime.smack:smack:$smackVersion"
 		testCompile "org.igniterealtime.smack:smackx:$smackVersion"
 		testCompile "javax.mail:mail:$javaxMailVersion"