From a3017736a2a15f9a5f7e98e82e2e91d485606e51 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Wed, 26 Jul 2017 15:35:52 -0400
Subject: [PATCH] Upgrade Derby dependency and some tests polishing

**Cherry-pick to master**
---
 build.gradle                                             | 4 +---
 .../jdbc/JdbcMessageStoreChannelTests-context.xml        | 7 +------
 .../jdbc/store/channel/DataSource-derby-context.xml      | 9 +--------
 .../resources/derby-stored-procedures-setup-context.xml  | 7 +------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 081d77f557..c57a3a089d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,7 +92,7 @@ subprojects { subproject ->
 		commonsIoVersion = '2.4'
 		commonsNetVersion = '3.4'
 		curatorVersion = '2.10.0'
-		derbyVersion = '10.11.1.1'
+		derbyVersion = '10.13.1.1'
 		eclipseLinkVersion = '2.5.2'
 		ftpServerVersion = '1.0.6'
 		groovyVersion = '2.4.6'
@@ -453,8 +453,6 @@ project('spring-integration-jpa') {
 		testCompile "org.springframework.data:spring-data-jpa:$springDataJpaVersion"
 
 		testCompile "com.h2database:h2:$h2Version"
-		testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
-		testCompile "org.apache.derby:derby:$derbyVersion"
 
 		testCompile "org.hibernate:hibernate-entitymanager:$hibernateVersion"
 
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
index 4bc2294e0e..633c01949c 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
@@ -12,12 +12,7 @@
 		http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource" >
-		<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
-		<property name="url" value="jdbc:derby:memory:myDB;create=true" />
-		<property name="username" value="sa" />
-		<property name="password" value="sa" />
-	</bean>
+	<jdbc:embedded-database id="dataSource" type="DERBY" />
 
 	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
 		<jdbc:script location="${int.drop.script}" />
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 8e6a6130c4..6752b7db49 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,14 +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">
-		<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
-		<property name="initialSize" value="10" />
-		<property name="url" value="jdbc:derby:memory:integration;create=true" />
-		<property name="username" value="int" />
-		<property name="password" value="int" />
-	</bean>
+	<jdbc:embedded-database id="dataSource" type="DERBY" />
 
 	<!-- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
 		destroy-method="close"> <property name="driverClassName" value="org.apache.derby.jdbc.ClientDriver"/>
diff --git a/spring-integration-jdbc/src/test/resources/derby-stored-procedures-setup-context.xml b/spring-integration-jdbc/src/test/resources/derby-stored-procedures-setup-context.xml
index 352c9b0cf7..7a647b57bf 100644
--- a/spring-integration-jdbc/src/test/resources/derby-stored-procedures-setup-context.xml
+++ b/spring-integration-jdbc/src/test/resources/derby-stored-procedures-setup-context.xml
@@ -5,12 +5,7 @@
 	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.springframework.jdbc.datasource.DriverManagerDataSource" >
-		<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
-		<property name="url" value="jdbc:derby:memory:myDB;create=true" />
-		<property name="username" value="sa" />
-		<property name="password" value="sa" />
-	</bean>
+	<jdbc:embedded-database id="dataSource" type="DERBY" />
 
 	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS" >
 		<jdbc:script location="classpath:derby-stored-procedures-drops.sql"/>