Upgrade some dependencies for 4.3

build.gradle

@@ -83,10 +83,10 @@ subprojects { subproject ->
 
 	ext {
 		activeMqVersion = '5.11.1'
-		aspectjVersion = '1.8.4'
-		apacheSshdVersion = '0.13.0'
+		aspectjVersion = '1.8.7'
+		apacheSshdVersion = '0.14.0'
 		boonVersion = '0.33'
-		chronicleVersion = '3.4.3'
+		chronicleVersion = '3.5.3'
 		commonsDbcpVersion = '1.4'
 		commonsIoVersion = '2.4'
 		commonsNetVersion = '3.3'
@@ -94,40 +94,40 @@ subprojects { subproject ->
 		derbyVersion = '10.11.1.1'
 		eclipseLinkVersion = '2.4.2'
 		ftpServerVersion = '1.0.6'
-		groovyVersion = '2.4.4'
-		guavaVersion = '18.0'
+		groovyVersion = '2.4.5'
+		guavaVersion = '19.0'
 		hamcrestVersion = '1.3'
 		hazelcastVersion = '3.5.1'
 		hibernateVersion = '4.3.10.Final'
-		hsqldbVersion = '2.3.2'
+		hsqldbVersion = '2.3.3'
 		h2Version = '1.4.180'
-		jackson2Version = '2.5.1'
+		jackson2Version = '2.5.4'
 		javaxActivationVersion = '1.1.1'
-		javaxMailVersion = '1.5.2'
+		javaxMailVersion = '1.5.5'
 		jedisVersion = '2.7.3'
 		jmsApiVersion = '1.1-rev-1'
 		jpa21ApiVersion = '1.0.0.Final'
 		jpaApiVersion = '2.0.0'
-		jrubyVersion = '1.7.19'
+		jrubyVersion = '1.7.23'
 		jschVersion = '0.1.52'
 		jsonpathVersion = '2.1.0'
-		junitVersion = '4.11'
+		junitVersion = '4.12'
 		jythonVersion = '2.5.3'
 		kryoShadedVersion = '3.0.3'
 		log4jVersion = '1.2.17'
 		mockitoVersion = '1.9.5'
 		mysqlVersion = '5.1.34'
 		nettyVersion = '4.0.27.Final'
-		openJpaVersion = '2.3.0'
+		openJpaVersion = '2.4.0'
 		pahoMqttClientVersion = '1.0.2'
 		postgresVersion = '9.1-901-1.jdbc4'
-		reactorVersion = '2.0.6.RELEASE'
+		reactorVersion = '2.0.7.RELEASE'
 		romeToolsVersion = '1.5.0'
 		saajApiVersion = '1.3.5'
 		saajImplVersion = '1.3.23'
 		servletApiVersion = '3.1.0'
-		slf4jVersion = "1.7.8"
-		tomcatVersion = "8.0.18"
+		slf4jVersion = "1.7.13"
+		tomcatVersion = "8.0.30"
 		smack3Version = '3.2.1'
 		smackVersion = '4.1.5'
 		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.5.2.RELEASE'
@@ -136,12 +136,12 @@ subprojects { subproject ->
 		springDataMongoVersion = '1.7.2.RELEASE'
 		springDataRedisVersion = '1.5.2.RELEASE'
 		springGemfireVersion = '1.6.0.RELEASE'
-		springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '4.0.2.RELEASE'
+		springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '4.0.3.RELEASE'
 		springSocialTwitterVersion = '1.1.1.RELEASE'
 		springRetryVersion = '1.1.2.RELEASE'
-		springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.3.RELEASE'
-		springWsVersion = '2.2.2.RELEASE'
-		xmlUnitVersion = '1.5'
+		springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.4.RELEASE'
+		springWsVersion = '2.2.4.RELEASE'
+		xmlUnitVersion = '1.6'
 		xstreamVersion = '1.4.7'
 		zookeeperVersion = '3.4.6'
 	}
@@ -465,7 +465,9 @@ project('spring-integration-jpa') {
 	compileTestJava.options.compilerArgs = ["${xLintArg},-processing"]
 
 	tasks.withType(Test).matching {it.name ==~ /(springIo.+)|(test)|(testAll)/}.all {
-		jvmArgs classpath.files.findAll{it.name ==~ /(spring-instrument.+)|(openjpa.+)/}.collect{"-javaagent:$it"}
+		jvmArgs classpath.files.findAll {
+			it.name ==~ /(spring-instrument.+)|(openjpa-${openJpaVersion}.+)/}.collect{"-javaagent:$it"
+		}
 	}
 
 }
@@ -680,7 +682,6 @@ project('spring-integration-xml') {
 			exclude group: 'org.springframework', module: 'spring-context'
 			exclude group: 'org.springframework', module: 'spring-core'
 		}
-		compile("javax.activation:activation:$javaxActivationVersion", optional)
 		testCompile "xmlunit:xmlunit:$xmlUnitVersion"
 	}
 }

spring-integration-core/src/main/java/org/springframework/integration/support/json/BoonJsonObjectMapper.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 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.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.support.json;
 
 import java.io.File;

spring-integration-core/src/test/java/org/springframework/integration/json/JsonTransformersSymmetricalTests.java

@@ -16,7 +16,8 @@
 
 package org.springframework.integration.json;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;