From 373e377768dc4a175c03db00900e7da87b5eb84b Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Tue, 2 Apr 2019 17:02:51 -0400
Subject: [PATCH] Upgrade dependencies

---
 .../spring-integration-context.xml            | 36 +++++++++----------
 build.gradle                                  | 12 +++----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index c6fb7719..5e832a6c 100644
--- a/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -8,23 +8,23 @@
 		http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-    
+
     <jdbc:embedded-database id="datasource" type="H2">
-        <jdbc:script location="classpath:setup-tables.sql"/>        
+        <jdbc:script location="classpath:setup-tables.sql"/>
     </jdbc:embedded-database>
 
     <!-- See also:
         https://docs.spring.io/spring-integration/reference/htmlsingle/#gateway-proxy
         https://www.enterpriseintegrationpatterns.com/MessagingGateway.html -->
-        
+
     <int:channel id="createPersonRequestChannel"/>
     <int:channel id="createPersonReplyChannel"/>
     <int:channel id="findPersonRequestChannel"/>
     <int:channel id="findPersonReplyChannel"/>
-    
-        
+
+
     <int:gateway id="personService" service-interface="org.springframework.integration.samples.jdbc.service.PersonService">
-    	<int:method name="createPerson" 
+    	<int:method name="createPerson"
     				request-channel="createPersonRequestChannel"
     				request-timeout="5000"
     				reply-channel="createPersonReplyChannel"
@@ -33,39 +33,39 @@
     				request-channel="findPersonRequestChannel"
     				request-timeout="5000"
     				reply-channel="findPersonReplyChannel"
-    				reply-timeout="5000"/>			
+    				reply-timeout="5000"/>
     </int:gateway>
 
     <int-jdbc:outbound-gateway data-source="datasource"
         update="UPDATE DUMMY SET DUMMY_VALUE='test'"
-                               request-channel="findPersonRequestChannel" 
+                               request-channel="findPersonRequestChannel"
                                query="select * from Person where lower(name)=lower(:payload)"
                                reply-channel="findPersonReplyChannel" row-mapper="personResultMapper"
                                max-rows-per-poll="100">
     </int-jdbc:outbound-gateway>
-        
-       
-	
+
+
+
 	<bean id="personResultMapper" class="org.springframework.integration.samples.jdbc.domain.PersonMapper"/>
-	<int-jdbc:outbound-gateway data-source="datasource" 
+	<int-jdbc:outbound-gateway data-source="datasource"
 								request-channel="createPersonRequestChannel"
 								reply-channel="createPersonReplyChannel"
-								update="insert into Person (name,gender,dateOfBirth) 
+								update="insert into Person (name,gender,dateOfBirth)
 										values
 										(:name,:gender,:dateOfBirth)"
-								query="select * from Person where id = :id"		
+								query="select * from Person where id = :id"
 								request-sql-parameter-source-factory="requestSource"
 								reply-sql-parameter-source-factory="replySource"
 								row-mapper="personResultMapper"
 								keys-generated="true"/>
-	
+
 	<bean id="replySource" class="org.springframework.integration.jdbc.ExpressionEvaluatingSqlParameterSourceFactory">
 		<property name="parameterExpressions">
 			<map>
-				<entry key="id" value="#this['SCOPE_IDENTITY()']"/>				
+				<entry key="id" value="#this.ID"/>
 			</map>
 		</property>
-	</bean>	
+	</bean>
 
 	<bean id="requestSource" class="org.springframework.integration.jdbc.ExpressionEvaluatingSqlParameterSourceFactory">
 		<property name="parameterExpressions">
@@ -75,6 +75,6 @@
 				<entry key="dateOfBirth" value="payload.dateOfBirth"/>
 			</map>
 		</property>
-	</bean>	
+	</bean>
 
 </beans>
diff --git a/build.gradle b/build.gradle
index e1ab5e20..890f5d56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ allprojects {
 	repositories {
 		maven { url 'https://repo.spring.io/libs-snapshot' }
 		maven { url 'https://repo.spring.io/libs-milestone' }
-			maven { url 'https://repo.spring.io/libs-staging-local' }
+//			maven { url 'https://repo.spring.io/libs-staging-local' }
 	}
 
 }
@@ -169,7 +169,7 @@ subprojects { subproject ->
 		}
 
 		ext {
-			activeMqVersion = '5.15.2'
+			activeMqVersion = '5.15.9'
 			apacheSshdVersion = '1.6.0'
 			aspectjVersion = '1.8.13'
 			commonsDigesterVersion = '2.0'
@@ -189,7 +189,7 @@ subprojects { subproject ->
 			guavaVersion = '16.0.1'
 			groovyVersion = '2.3.0'
 			hsqldbVersion = '2.3.2'
-			h2Version = '1.4.194'
+			h2Version = '1.4.199'
 			jacksonVersion = '2.3.2'
 			jasyptVersion = '1.7'
 			javaxInjectVersion = '1'
@@ -211,12 +211,12 @@ subprojects { subproject ->
 			postgresVersion = '42.0.0'
 			subethasmtpVersion = '1.2'
 			slf4jVersion = '1.7.25'
-			springIntegrationVersion = '5.0.13.BUILD-SNAPSHOT'
+			springIntegrationVersion = '5.0.13.RELEASE'
 			springIntegrationKafkaVersion = '3.0.4.BUILD-SNAPSHOT'
 			springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'
 			springKafkaVersion = '2.1.10.RELEASE'
-			springVersion = '5.0.13.BUILD-SNAPSHOT'
-			springSecurityVersion = '5.0.10.RELEASE'
+			springVersion = '5.0.13.RELEASE'
+			springSecurityVersion = '5.0.12.RELEASE'
 			springWebFlowVersion = '2.3.3.RELEASE'
 			tilesJspVersion = '2.2.1'
 			validationApiVersion = '1.0.0.GA'