Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3301 Update Versions of Numerous Dependencies

Browse Source 
JIRA: https://jira.springsource.org/browse/INT-3301

INT-3301 Polishing; Bump Hibernate to 4.3.1

* Fix JDBC Test after version update
* Bump Hibernate version to fix failing test

Latest versions of HSQLDB and Spring
This commit is contained in:
Andy Wilkinson
2014-02-18 12:28:44 +00:00
committed by Gary Russell
parent ccb0b8aa8e
commit 28a23307cd
5 changed files with 103 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
build.gradle
View File

@@ -58,36 +58,57 @@ subprojects { subproject ->
targetCompatibility=1.6
ext {
aspectjVersion = '1.6.8'
commonsNetVersion = '3.0.1'
activeMqVersion = '5.9.0'
aspectjVersion = '1.7.4'
commonsDbcpVersion = '1.4'
commonsIoVersion = '2.4'
commonsNetVersion = '3.3'
derbyVersion = '10.10.1.1'
groovyVersion = '2.1.0'
hamcrestVersion = '1.3'
jacksonVersion = '1.9.2'
jackson2Version = '2.2.3'
javaxActivationVersion = '1.1.1'
junitVersion = '4.11'
log4jVersion = '1.2.12'
mockitoVersion = '1.9.5'
eclipseLinkVersion = '2.5.1'
ftpServerVersion = '1.0.6'
hsqldbVersion = '1.8.0.10'
h2Version = '1.3.172'
activeMqVersion = '5.8.0'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.1.RELEASE'
groovyVersion = '2.2.1'
guavaVersion = '16.0.1'
hamcrestVersion = '1.3'
hibernateVersion = '4.3.1.Final'
hsqldbVersion = '2.3.2'
h2Version = '1.3.175'
jacksonVersion = '1.9.13'
jackson2Version = '2.3.1'
javaxActivationVersion = '1.1.1'
javaxMailVersion = '1.4.7'
jmsSpecVersion = '1.1.1'
jpa21ApiVersion = '1.0.0.Final'
jrubyVersion = '1.7.10'
jschVersion = '0.1.50'
jsonpathVersion = '0.9.1'
junitVersion = '4.11'
jythonVersion = '2.5.3'
lettuceVersion = '2.3.3'
log4jVersion = '1.2.17'
mockitoVersion = '1.9.5'
mysqlVersion = '5.1.29'
openJpaVersion = '2.3.0'
pahoMqttClientVersion = '0.4.0'
postgresVersion = '9.1-901-1.jdbc4'
powermockVersion = '1.5.4'
romeVersion = '1.0.0'
saajApiVersion = '1.3.5'
saajImplVersion = '1.3.23'
servletApiVersion = '3.1.0'
smackVersion = '3.2.1'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.3.0.M2'
springBootVersion = '1.0.0.RC1'
springDataMongoVersion = '1.1.1.RELEASE'
springDataRedisVersion = '1.1.1.RELEASE'
lettuceVersion = '2.3.3'
springGemfireVersion = '1.3.1.RELEASE'
springSecurityVersion = '3.1.3.RELEASE'
springSocialTwitterVersion = '1.0.5.RELEASE'
springWsVersion = '2.1.1.RELEASE'
springRetryVersion = '1.0.3.RELEASE'
springBootVersion = '1.0.0.RC1'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.2.RELEASE'
springWsVersion = '2.1.1.RELEASE'
staxApiVersion = '1.0.1'
xmlUnitVersion = '1.5'
xstreamVersion = '1.4.7'
}
eclipse {
@@ -205,7 +226,7 @@ project('spring-integration-core') {
compile "org.springframework.retry:spring-retry:$springRetryVersion"
compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
compile("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional)
compile('com.jayway.jsonpath:json-path:0.9.0', optional)
compile("com.jayway.jsonpath:json-path:$jsonpathVersion", optional)
testCompile ("org.aspectj:aspectjweaver:$aspectjVersion")
testCompile ("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion") {
@@ -227,10 +248,10 @@ project('spring-integration-feed') {
dependencies {
compile project(":spring-integration-core")
compile "org.springframework:spring-context:$springVersion"
compile("net.java.dev.rome:rome-fetcher:1.0.0") {
compile("net.java.dev.rome:rome-fetcher:$romeVersion") {
exclude group: 'junit'
}
compile "net.java.dev.rome:rome:1.0.0"
compile "net.java.dev.rome:rome:$romeVersion"
}
}
@@ -288,17 +309,13 @@ project('spring-integration-http') {
compile project(":spring-integration-core")
compile "org.springframework:spring-webmvc:$springVersion"
compile("javax.servlet:javax.servlet-api:3.0.1", provided)
compile("javax.servlet:javax.servlet-api:$servletApiVersion", provided)
compile("commons-httpclient:commons-httpclient:3.1") { dep ->
compile("net.java.dev.rome:rome-fetcher:$romeVersion") { dep ->
optional dep
exclude group: 'junit', module: 'junit'
}
compile("net.java.dev.rome:rome-fetcher:1.0.0") { dep ->
optional dep
exclude group: 'junit', module: 'junit'
}
compile ("net.java.dev.rome:rome:1.0.0", optional)
compile ("net.java.dev.rome:rome:$romeVersion", optional)
}
@@ -327,19 +344,18 @@ project('spring-integration-jdbc') {
compile "org.springframework:spring-aop:$springVersion"
compile "org.springframework:spring-jdbc:$springVersion"
compile "org.springframework:spring-tx:$springVersion"
compile "com.google.guava:guava:12.0"
compile "com.google.guava:guava:$guavaVersion"
testCompile "com.h2database:h2:$h2Version"
testCompile "hsqldb:hsqldb:$hsqldbVersion"
testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
testCompile "org.apache.derby:derby:$derbyVersion"
testCompile "org.apache.derby:derbyclient:$derbyVersion"
testCompile "org.powermock:powermock-module-junit4:1.5"
testCompile "org.powermock:powermock-api-mockito:1.5"
testCompile "org.powermock:powermock-module-junit4:$powermockVersion"
testCompile "org.powermock:powermock-api-mockito:$powermockVersion"
testCompile "postgresql:postgresql:9.1-901-1.jdbc4"
testCompile "mysql:mysql-connector-java:5.1.24"
testCompile "commons-dbcp:commons-dbcp:1.4"
//testCompile "com.oracle:ojdbc6:11.2.0.3"
testCompile "postgresql:postgresql:$postgresVersion"
testCompile "mysql:mysql-connector-java:$mysqlVersion"
testCompile "commons-dbcp:commons-dbcp:$commonsDbcpVersion"
}
@@ -353,7 +369,7 @@ project('spring-integration-jms') {
compile project(":spring-integration-core")
compile "org.springframework:spring-jms:$springVersion"
compile "org.springframework:spring-tx:$springVersion"
compile ("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1", provided)
compile ("org.apache.geronimo.specs:geronimo-jms_1.1_spec:$jmsSpecVersion", provided)
testCompile("org.apache.activemq:activemq-broker:$activeMqVersion")
testCompile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") {
exclude group: "org.springframework"
@@ -378,18 +394,18 @@ project('spring-integration-jpa') {
compile "org.springframework:spring-aop:$springVersion"
compile "org.springframework:spring-orm:$springVersion"
compile "org.springframework:spring-tx:$springVersion"
compile "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final"
compile "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion"
testCompile "com.h2database:h2:$h2Version"
testCompile "hsqldb:hsqldb:$hsqldbVersion"
testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
testCompile "org.apache.derby:derby:$derbyVersion"
testCompile "org.hibernate:hibernate-entitymanager:3.6.10.Final"
testCompile ("org.apache.openjpa:openjpa:2.2.0") {
testCompile "org.hibernate:hibernate-entitymanager:$hibernateVersion"
testCompile ("org.apache.openjpa:openjpa:$openJpaVersion") {
exclude group: 'org.apache.geronimo.specs'
}
testRuntime "org.eclipse.persistence:org.eclipse.persistence.jpa:2.3.2"
testRuntime "org.eclipse.persistence:org.eclipse.persistence.jpa:$eclipseLinkVersion"
testRuntime "org.springframework:spring-instrument:$springVersion"
}
@@ -410,7 +426,7 @@ project('spring-integration-mail') {
dependencies {
compile project(":spring-integration-core")
compile "org.springframework:spring-context-support:$springVersion"
compile("javax.mail:mail:1.4.7", provided)
compile("javax.mail:mail:$javaxMailVersion", provided)
compile("javax.activation:activation:$javaxActivationVersion", optional)
}
@@ -433,7 +449,7 @@ project('spring-integration-mqtt') {
description = 'Spring Integration MQTT Support'
dependencies {
compile project(":spring-integration-core")
compile "org.eclipse.paho:mqtt-client:0.4.0"
compile "org.eclipse.paho:mqtt-client:$pahoMqttClientVersion"
}
}
@@ -465,9 +481,9 @@ project('spring-integration-scripting') {
description = 'Spring Integration Scripting Support'
dependencies {
compile project(":spring-integration-core")
testCompile("org.jruby:jruby:1.6.3")
testCompile("org.jruby:jruby:$jrubyVersion")
testCompile("org.codehaus.groovy:groovy-all:$groovyVersion")
testCompile("org.python:jython-standalone:2.5.2")
testCompile("org.python:jython-standalone:$jythonVersion")
}
}
@@ -492,7 +508,7 @@ project('spring-integration-sftp') {
compile project(":spring-integration-core")
compile project(":spring-integration-file")
compile project(":spring-integration-stream")
compile "com.jcraft:jsch:0.1.49"
compile "com.jcraft:jsch:$jschVersion"
compile "org.springframework:spring-context-support:$springVersion"
compile("javax.activation:activation:$javaxActivationVersion", optional)
}
@@ -550,24 +566,24 @@ project('spring-integration-ws') {
compile ("org.springframework.ws:spring-ws-core:$springWsVersion") {
exclude group: 'org.springframework'
}
compile("javax.xml.soap:saaj-api:1.3") { dep ->
compile("javax.xml.soap:saaj-api:$saajApiVersion") { dep ->
optional dep
exclude group: 'javax.activation', module: 'activation'
}
compile("com.sun.xml.messaging.saaj:saaj-impl:1.3", optional)
compile("com.sun.xml.messaging.saaj:saaj-impl:$saajImplVersion", optional)
compile("javax.activation:activation:$javaxActivationVersion", optional)
testCompile "stax:stax-api:1.0.1"
testCompile 'com.thoughtworks.xstream:xstream:1.4.4'
testCompile "stax:stax-api:$staxApiVersion"
testCompile "com.thoughtworks.xstream:xstream:$xstreamVersion"
testCompile ("org.springframework.ws:spring-ws-support:$springWsVersion") {
exclude group: 'org.springframework'
}
testCompile ("org.springframework:spring-jms:$springVersion") {
exclude group: 'org.springframework'
}
testCompile "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1"
testCompile "org.igniterealtime.smack:smack:3.2.1"
testCompile "org.igniterealtime.smack:smackx:3.2.1"
testCompile "javax.mail:mail:1.4.5"
testCompile "org.apache.geronimo.specs:geronimo-jms_1.1_spec:$jmsSpecVersion"
testCompile "org.igniterealtime.smack:smack:$smackVersion"
testCompile "org.igniterealtime.smack:smackx:$smackVersion"
testCompile "javax.mail:mail:$javaxMailVersion"
}
// suppress saaj path warnings
@@ -584,7 +600,7 @@ project('spring-integration-xml') {
exclude group: 'org.springframework'
}
compile("javax.activation:activation:$javaxActivationVersion", optional)
testCompile "xmlunit:xmlunit:1.3"
testCompile "xmlunit:xmlunit:$xmlUnitVersion"
}
}
@@ -593,8 +609,8 @@ project('spring-integration-xmpp') {
dependencies {
compile project(":spring-integration-core")
compile("javax.activation:activation:$javaxActivationVersion", optional)
compile "org.igniterealtime.smack:smack:3.2.1"
compile "org.igniterealtime.smack:smackx:3.2.1"
compile "org.igniterealtime.smack:smack:$smackVersion"
compile "org.igniterealtime.smack:smackx:$smackVersion"
compile "org.springframework:spring-context-support:$springVersion"
testCompile project(":spring-integration-stream")
}

12
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java
View File

@@ -23,13 +23,14 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.messaging.Message;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.messaging.Message;
import org.springframework.messaging.support.GenericMessage;
/**
* @author Dave Syer
@@ -76,10 +77,13 @@ public class JdbcMessageHandlerIntegrationTests {
@Test
public void testIdHeaderDynamicInsert() {
JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate, "insert into foos (id, status, name) values (:headers[id], 0, :payload)");
JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate, "insert into foos (id, status, name) values (:headers[idAsString], 0, :payload)");
Message<String> message = new GenericMessage<String>("foo");
handler.handleMessage(message);
String id = message.getHeaders().getId().toString();
message = MessageBuilder.fromMessage(message)
.setHeader("idAsString", message.getHeaders().getId().toString())
.build();
handler.handleMessage(message);
Map<String, Object> map = jdbcTemplate.queryForMap("SELECT * FROM FOOS WHERE ID=?", id);
assertEquals("Wrong id", id, map.get("ID"));
assertEquals("Wrong name", "foo", map.get("NAME"));

2
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcTypesEnumTests.java
View File

@@ -5,7 +5,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import org.hsqldb.Types;
import java.sql.Types;
import org.junit.Test;
public class JdbcTypesEnumTests {

35
spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java
View File

@@ -12,15 +12,10 @@
*/
package org.springframework.integration.jpa.core;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.Map;
import javax.sql.DataSource;
import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,36 +38,6 @@ public class HibernateJpaOperationsTests extends AbstractJpaOperationsTests {
@Autowired
private LocalContainerEntityManagerFactoryBean fb;
/**
* Little helper that allows you to generate the DDL via Hibernate. The
* DDL is printed to the console.
*/
@Test
public void generateDdl() {
final org.hibernate.ejb.Ejb3Configuration cfg = new org.hibernate.ejb.Ejb3Configuration();
Map<String, Object> properties = fb.getJpaPropertyMap();
properties.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
final org.hibernate.ejb.Ejb3Configuration configured = cfg.configure( fb.getPersistenceUnitInfo(), fb.getJpaPropertyMap() );
final Configuration configuration = configured.getHibernateConfiguration();
final SchemaExport schemaExport;
try {
schemaExport = new SchemaExport(configuration, dataSource.getConnection());
} catch (HibernateException e) {
throw new IllegalStateException(e);
} catch (SQLException e) {
throw new IllegalStateException(e);
}
schemaExport.create(true, false);
}
@Test
@Override
public void testExecuteUpdate() {

32
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java
View File

@@ -22,6 +22,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -221,10 +222,10 @@ public class SftpOutboundTests {
@Test
public void testSharedSession() throws Exception {
JSch jsch = spy(new JSch());
Constructor<com.jcraft.jsch.Session> ctor = com.jcraft.jsch.Session.class.getDeclaredConstructor(JSch.class);
Constructor<com.jcraft.jsch.Session> ctor = com.jcraft.jsch.Session.class.getDeclaredConstructor(JSch.class, String.class, String.class, int.class);
ctor.setAccessible(true);
com.jcraft.jsch.Session jschSession1 = spy(ctor.newInstance(jsch));
com.jcraft.jsch.Session jschSession2 = spy(ctor.newInstance(jsch));
com.jcraft.jsch.Session jschSession1 = spy(ctor.newInstance(jsch, "foo", "host", 22));
com.jcraft.jsch.Session jschSession2 = spy(ctor.newInstance(jsch, "foo", "host", 22));
new DirectFieldAccessor(jschSession1).setPropertyValue("isConnected", true);
new DirectFieldAccessor(jschSession2).setPropertyValue("isConnected", true);
when(jsch.getSession("foo", "host", 22)).thenReturn(jschSession1, jschSession2);
@@ -232,7 +233,8 @@ public class SftpOutboundTests {
ChannelSftp channel2 = spy(new ChannelSftp());
new DirectFieldAccessor(channel1).setPropertyValue("session", jschSession1);
new DirectFieldAccessor(channel2).setPropertyValue("session", jschSession1);
when(jschSession1.openChannel("sftp")).thenReturn(channel1, channel2);
doReturn(channel1).when(jschSession1).openChannel("sftp");
doReturn(channel2).when(jschSession1).openChannel("sftp");
DefaultSftpSessionFactory factory = new DefaultSftpSessionFactory(jsch, true);
factory.setHost("host");
factory.setUser("foo");
@@ -247,10 +249,10 @@ public class SftpOutboundTests {
@Test
public void testNotSharedSession() throws Exception {
JSch jsch = spy(new JSch());
Constructor<com.jcraft.jsch.Session> ctor = com.jcraft.jsch.Session.class.getDeclaredConstructor(JSch.class);
Constructor<com.jcraft.jsch.Session> ctor = com.jcraft.jsch.Session.class.getDeclaredConstructor(JSch.class, String.class, String.class, int.class);
ctor.setAccessible(true);
com.jcraft.jsch.Session jschSession1 = spy(ctor.newInstance(jsch));
com.jcraft.jsch.Session jschSession2 = spy(ctor.newInstance(jsch));
com.jcraft.jsch.Session jschSession1 = spy(ctor.newInstance(jsch, "foo", "host", 22));
com.jcraft.jsch.Session jschSession2 = spy(ctor.newInstance(jsch, "foo", "host", 22));
new DirectFieldAccessor(jschSession1).setPropertyValue("isConnected", true);
new DirectFieldAccessor(jschSession2).setPropertyValue("isConnected", true);
when(jsch.getSession("foo", "host", 22)).thenReturn(jschSession1, jschSession2);
@@ -258,8 +260,8 @@ public class SftpOutboundTests {
ChannelSftp channel2 = spy(new ChannelSftp());
new DirectFieldAccessor(channel1).setPropertyValue("session", jschSession1);
new DirectFieldAccessor(channel2).setPropertyValue("session", jschSession1);
when(jschSession1.openChannel("sftp")).thenReturn(channel1);
when(jschSession2.openChannel("sftp")).thenReturn(channel2);
doReturn(channel1).when(jschSession1).openChannel("sftp");
doReturn(channel2).when(jschSession2).openChannel("sftp");
DefaultSftpSessionFactory factory = new DefaultSftpSessionFactory(jsch, false);
factory.setHost("host");
factory.setUser("foo");
@@ -274,10 +276,10 @@ public class SftpOutboundTests {
@Test
public void testSharedSessionCachedReset() throws Exception {
JSch jsch = spy(new JSch());
Constructor<com.jcraft.jsch.Session> ctor = com.jcraft.jsch.Session.class.getDeclaredConstructor(JSch.class);
Constructor<com.jcraft.jsch.Session> ctor = com.jcraft.jsch.Session.class.getDeclaredConstructor(JSch.class, String.class, String.class, int.class);
ctor.setAccessible(true);
com.jcraft.jsch.Session jschSession1 = spy(ctor.newInstance(jsch));
com.jcraft.jsch.Session jschSession2 = spy(ctor.newInstance(jsch));
com.jcraft.jsch.Session jschSession1 = spy(ctor.newInstance(jsch, "foo", "host", 22));
com.jcraft.jsch.Session jschSession2 = spy(ctor.newInstance(jsch, "foo", "host", 22));
new DirectFieldAccessor(jschSession1).setPropertyValue("isConnected", true);
new DirectFieldAccessor(jschSession2).setPropertyValue("isConnected", true);
when(jsch.getSession("foo", "host", 22)).thenReturn(jschSession1, jschSession2);
@@ -287,8 +289,10 @@ public class SftpOutboundTests {
ChannelSftp channel4 = spy(new ChannelSftp());
new DirectFieldAccessor(channel1).setPropertyValue("session", jschSession1);
new DirectFieldAccessor(channel2).setPropertyValue("session", jschSession1);
when(jschSession1.openChannel("sftp")).thenReturn(channel1, channel2);
when(jschSession2.openChannel("sftp")).thenReturn(channel3, channel4);
doReturn(channel1).when(jschSession1).openChannel("sftp");
doReturn(channel2).when(jschSession1).openChannel("sftp");
doReturn(channel3).when(jschSession2).openChannel("sftp");
doReturn(channel4).when(jschSession2).openChannel("sftp");
DefaultSftpSessionFactory factory = new DefaultSftpSessionFactory(jsch, true);
factory.setHost("host");
factory.setUser("foo");