Downgrade to Derby-10.13.1.1

Looks like we have started to fail much often
since upgrade to the `Derby-10.14.1.0`:
cb0d43d

That is also related to this https://jira.spring.io/browse/INT-4445

* Remove all the `drop` mentioning for Derby scripts -
it just doesn't support `IF EXISTS`.
More over we don't need to worry about drops since each test now starts
its own fresh embedded DB

**Cherry-pick to 5.0.x**

Author: artembilan

build.gradle

@@ -96,7 +96,7 @@ subprojects { subproject ->
 		commonsIoVersion = '2.4'
 		commonsNetVersion = '3.5'
 		curatorVersion = '2.11.1'
-		derbyVersion = '10.14.1.0'
+		derbyVersion = '10.13.1.1'
 		eclipseLinkVersion = '2.6.4'
 		ftpServerVersion = '1.1.1'
 		groovyVersion = '2.4.12'

spring-integration-jdbc/src/test/java/int-derby.properties

@@ -1,4 +1,3 @@
 # Placeholders for Derby:
-int.drop.script=classpath:/org/springframework/integration/jdbc/schema-drop-derby.sql
 int.schema.script=classpath:/org/springframework/integration/jdbc/schema-derby.sql
 int.database.incrementer.class=org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests-context.xml

@@ -20,9 +20,7 @@
 
 	<jdbc:embedded-database id="dataSource" type="DERBY"/>
 
-	<jdbc:initialize-database data-source="dataSource"
-							  ignore-failures="ALL">
-		<jdbc:script location="${int.drop.script}"/>
+	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="${int.schema.script}"/>
 	</jdbc:initialize-database>
 

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,13 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
+import org.springframework.integration.aggregator.AggregatingMessageHandler;
 import org.springframework.integration.store.MessageGroupStore;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
@@ -44,6 +46,7 @@
 
 /**
  * @author Artem Bilan
+ *
  * @since 4.1
  */
 @ContextConfiguration
@@ -57,6 +60,14 @@ public class AggregatorIntegrationTests {
 	@Autowired
 	private MessageGroupStore messageGroupStore;
 
+	@Autowired
+	private AggregatingMessageHandler aggregatingMessageHandler;
+
+	@After
+	public void tearDown() {
+		this.aggregatingMessageHandler.stop();
+	}
+
 	@Test
 	public void testTransactionalAggregatorGroupTimeout() throws InterruptedException {
 		this.transactionalAggregatorInput.send(new GenericMessage<Integer>(1, stubHeaders(1, 2, 1)));

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJmxManagedBeanTests-context.xml

@@ -2,19 +2,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<context:mbean-server />
 	<context:mbean-export default-domain="org.springframework.integration.jdbc.test" />

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundAdapterWithPollerTest-context.xml

@@ -25,7 +25,7 @@
 
 	<jdbc:embedded-database type="H2" id="dataSource"/>
 
-	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
+	<jdbc:initialize-database data-source="dataSource">
 	    <jdbc:script location="org/springframework/integration/jdbc/config/outboundPollerSchema.sql" />
 	</jdbc:initialize-database>
 

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayWithPoller2Test-context.xml

@@ -25,7 +25,7 @@
 
     <jdbc:embedded-database id="dataSource" type="H2"/>
 
-    <jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
+    <jdbc:initialize-database data-source="dataSource">
         <jdbc:script location="classpath:org/springframework/integration/jdbc/config/outboundPollerSchema.sql"/>
     </jdbc:initialize-database>
 

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayWithPollerTest-context.xml

@@ -31,7 +31,7 @@
 
 	<jdbc:embedded-database id="dataSource" type="H2"/>
 
-	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
+	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="classpath:org/springframework/integration/jdbc/config/outboundPollerSchema.sql"/>
 	</jdbc:initialize-database>
 

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayWithSelectTest-context.xml

@@ -27,7 +27,7 @@
 
 	<jdbc:embedded-database id="dataSource" type="H2"/>
 
-	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
+	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="classpath:org/springframework/integration/jdbc/config/outboundPollerSchemaWithData.sql"/>
 	</jdbc:initialize-database>
 

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/jdbcOutboundChannelAdapterCommonConfig.xml

@@ -11,7 +11,7 @@
 
 	<jdbc:embedded-database type="H2" id="dataSource"/>
 
-	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
+	<jdbc:initialize-database data-source="dataSource">
 		<jdbc:script location="classpath:org/springframework/integration/jdbc/config/outboundSchema.sql"/>
 	</jdbc:initialize-database>