From 93fc5bf919973643ff2667913eef996189d046ab Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Tue, 12 Jan 2021 09:59:35 -0500
Subject: [PATCH] Fix another Derby test in favor of H2

---
 .../JdbcMessageStoreChannelIntegrationTests-context.xml  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests-context.xml
index 998fcb34c1..0232148a9a 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests-context.xml
@@ -14,10 +14,10 @@
 		http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
-	<jdbc:embedded-database id="dataSource" type="DERBY"/>
+	<jdbc:embedded-database id="dataSource" type="H2"/>
 
 	<jdbc:initialize-database data-source="dataSource">
-		<jdbc:script location="${int.schema.script}"/>
+		<jdbc:script location="classpath:/org/springframework/integration/jdbc/schema-h2.sql"/>
 	</jdbc:initialize-database>
 
 	<int-jdbc:message-store id="messageStore" data-source="dataSource"/>
@@ -56,11 +56,6 @@
 		</tx:attributes>
 	</tx:advice>
 
-	<context:property-placeholder location="int-${ENVIRONMENT:derby}.properties"
-								  system-properties-mode="OVERRIDE"
-								  ignore-unresolvable="true"
-								  order="1"/>
-
 	<bean id="transactionManager"
 		  class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
 		<property name="dataSource" ref="dataSource"/>