From 1282cb522ab967add47b485bb5865815b80a5636 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 27 Apr 2017 10:11:49 -0400
Subject: [PATCH] Align With Spring Boot Dependencies

- Various deps and update to commons dbcp2
- Fix a couple of DOS EOL files
---
 build.gradle                                  | 14 +++----
 .../jdbc/mysql/CommonMySql-context.xml        | 42 +++++++++----------
 ...ssageStoreMultipleChannelTests-context.xml |  2 +-
 .../MySqlJdbcMessageStoreTests-context.xml    | 42 +++++++++----------
 .../channel/DataSource-derby-context.xml      |  4 +-
 .../store/channel/DataSource-h2-context.xml   |  2 +-
 .../store/channel/DataSource-hsql-context.xml |  2 +-
 .../channel/DataSource-mysql-context.xml      |  2 +-
 .../channel/DataSource-postgres-context.xml   |  2 +-
 9 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/build.gradle b/build.gradle
index ac9427649d..35585d53a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,25 +88,25 @@ subprojects { subproject ->
 
 	ext {
 		activeMqVersion = '5.14.5'
-		aspectjVersion = '1.8.9'
+		aspectjVersion = '1.8.10'
 		apacheSshdVersion = '1.4.0'
 		boonVersion = '0.34'
 		chronicleVersion = '3.5.3'
-		commonsDbcpVersion = '1.4'
+		commonsDbcp2Version = '2.1.1'
 		commonsIoVersion = '2.4'
 		commonsNetVersion = '3.5'
 		curatorVersion = '2.11.1'
 		derbyVersion = '10.13.1.1'
 		eclipseLinkVersion = '2.6.4'
 		ftpServerVersion = '1.0.6'
-		groovyVersion = '2.4.6'
+		groovyVersion = '2.4.10'
 		guavaVersion = '20.0'
 		hamcrestVersion = '1.3'
 		hazelcastVersion = '3.8'
 		hibernateVersion = '5.2.10.Final'
 		hsqldbVersion = '2.4.0'
 		h2Version = '1.4.194'
-		jackson2Version = '2.9.0.pr2'
+		jackson2Version = '2.9.0.pr3'
 		javaxActivationVersion = '1.1.1'
 		javaxMailVersion = '1.6.0-rc1'
 		jedisVersion = '2.9.0'
@@ -123,7 +123,7 @@ subprojects { subproject ->
 		mockitoVersion = '2.7.22'
 		mysqlVersion = '5.1.41'
 		pahoMqttClientVersion = '1.1.1'
-		postgresVersion = '9.1-901-1.jdbc4'
+		postgresVersion = '42.0.0'
 		reactorNettyVersion = '0.6.3.BUILD-SNAPSHOT'
 		reactorVersion = '3.1.0.BUILD-SNAPSHOT'
 		romeToolsVersion = '1.7.2'
@@ -420,9 +420,9 @@ project('spring-integration-jdbc') {
 		testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
 		testCompile "org.apache.derby:derby:$derbyVersion"
 		testCompile "org.apache.derby:derbyclient:$derbyVersion"
-		testCompile "postgresql:postgresql:$postgresVersion"
+		testCompile "org.postgresql:postgresql:$postgresVersion"
 		testCompile "mysql:mysql-connector-java:$mysqlVersion"
-		testCompile "commons-dbcp:commons-dbcp:$commonsDbcpVersion"
+		testCompile "org.apache.commons:commons-dbcp2:$commonsDbcp2Version"
 
 	}
 
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/CommonMySql-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/CommonMySql-context.xml
index 968cc852d5..ae19a3e21a 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/CommonMySql-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/CommonMySql-context.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	 <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-		<property name="url" value="jdbc:mysql://localhost:3306/int30"/>
-		<property name="username" value="root"/>
-		<property name="password" value="root"/>
-		<property name="maxActive" value="10"/>
-		<property name="defaultAutoCommit" value="false"/>
-	</bean>
-
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	 <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+		<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+		<property name="url" value="jdbc:mysql://localhost:3306/int30"/>
+		<property name="username" value="root"/>
+		<property name="password" value="root"/>
+		<property name="maxActive" value="10"/>
+		<property name="defaultAutoCommit" value="false"/>
+	</bean>
+
+	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+
+</beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests-context.xml
index 4ff7bcdaef..6af4e9e1b5 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests-context.xml
@@ -19,7 +19,7 @@
 	<tx:annotation-driven/>
 	<int:annotation-config/>
 
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
 		<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
 		<property name="url" value="jdbc:mysql://localhost:3306/int30"/>
 		<property name="username" value="root"/>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests-context.xml
index 968cc852d5..ae19a3e21a 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests-context.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	 <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-		<property name="url" value="jdbc:mysql://localhost:3306/int30"/>
-		<property name="username" value="root"/>
-		<property name="password" value="root"/>
-		<property name="maxActive" value="10"/>
-		<property name="defaultAutoCommit" value="false"/>
-	</bean>
-
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	 <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+		<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+		<property name="url" value="jdbc:mysql://localhost:3306/int30"/>
+		<property name="username" value="root"/>
+		<property name="password" value="root"/>
+		<property name="maxActive" value="10"/>
+		<property name="defaultAutoCommit" value="false"/>
+	</bean>
+
+	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+
+</beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
index 2e1e941eae..15b7bdf411 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
@@ -8,7 +8,7 @@
 
 	<import resource="classpath:org/springframework/integration/jdbc/store/channel/DataSource-common-context.xml" />
 
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
+	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource"
 		destroy-method="close">
 		<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
 		<property name="initialSize" value="10" />
@@ -17,7 +17,7 @@
 		<property name="password" value="int" />
 	</bean>
 
-	<!-- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
+	<!-- <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource"
 		destroy-method="close"> <property name="driverClassName" value="org.apache.derby.jdbc.ClientDriver"/>
 		<property name="initialSize" value="10"/> <property name="url" value="jdbc:derby://localhost:1527/integration;create=true"
 		/> <property name="username" value="int" /> <property name="password" value="int"
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-h2-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-h2-context.xml
index 8436e94392..77ef0ae379 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-h2-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-h2-context.xml
@@ -8,7 +8,7 @@
 
 	<import resource="classpath:org/springframework/integration/jdbc/store/channel/DataSource-common-context.xml" />
 
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
 		<property name="driverClassName" value="org.h2.Driver" />
 		<property name="initialSize" value="10" />
 		<property name="url" value="jdbc:h2:mem:integration" />
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml
index 28e5186b42..d5c3051859 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml
@@ -8,7 +8,7 @@
 
 	<import resource="classpath:org/springframework/integration/jdbc/store/channel/DataSource-common-context.xml" />
 
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
 		<property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
 		<property name="initialSize" value="10"/>
 		<property name="url" value="jdbc:hsqldb:mem:integration;hsqldb.tx=mvcc" />
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-mysql-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-mysql-context.xml
index 752575bb42..10116fd4ea 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-mysql-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-mysql-context.xml
@@ -9,7 +9,7 @@
 	<import resource="classpath:org/springframework/integration/jdbc/store/channel/DataSource-common-context.xml" />
 
 	<bean id="dataSource" destroy-method="close"
-		class="org.apache.commons.dbcp.BasicDataSource">
+		class="org.apache.commons.dbcp2.BasicDataSource">
 		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
 		<property name="url" value="jdbc:mysql://localhost/test" />
 		<property name="username" value="root" />
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-postgres-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-postgres-context.xml
index 1177e4944a..08fd863bba 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-postgres-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-postgres-context.xml
@@ -8,7 +8,7 @@
 
 	<import resource="classpath:org/springframework/integration/jdbc/store/channel/DataSource-common-context.xml" />
 
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
+	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource"
 		destroy-method="close">
 		<property name="driverClassName" value="org.postgresql.Driver" />
 		<property name="initialSize" value="10"/>