From 9d21bf29f65c633d9d7e189bdbde3e1e8fbfdab9 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 28 Nov 2018 13:55:15 -0500 Subject: [PATCH] Upgrade dependencies and fix tests for them --- build.gradle | 38 +++++++++---------- .../integration/sftp/SftpTestSupport.java | 12 +++--- .../sftp/session/SftpServerTests.java | 8 ++-- .../sftp/session/SftpSessionFactoryTests.java | 7 ++-- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index eaaa30f0f0..f3207ad41c 100644 --- a/build.gradle +++ b/build.gradle @@ -84,8 +84,8 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.15.3' - apacheSshdVersion = '2.0.0' + activeMqVersion = '5.15.8' + apacheSshdVersion = '2.1.0' aspectjVersion = '1.9.2' assertjVersion = '3.11.1' assertkVersion = '0.12' @@ -94,38 +94,38 @@ subprojects { subproject -> commonsIoVersion = '2.6' commonsNetVersion = '3.6' curatorVersion = '4.0.1' - derbyVersion = '10.13.1.1' - eclipseLinkVersion = '2.7.1' + derbyVersion = '10.14.2.0' + eclipseLinkVersion = '2.7.3' ftpServerVersion = '1.1.1' googleJsr305Version = '3.0.2' - groovyVersion = '2.5.3' + groovyVersion = '2.5.4' guavaVersion = '26.0-jre' hamcrestVersion = '1.3' - hazelcastVersion = '3.10.5' - hibernateVersion = '5.3.6.Final' - hsqldbVersion = '2.4.0' + hazelcastVersion = '3.11' + hibernateVersion = '5.3.7.Final' + hsqldbVersion = '2.4.1' h2Version = '1.4.197' - jackson2Version = '2.9.6' + jackson2Version = '2.9.7' javaxActivationVersion = '1.1.1' javaxMailVersion = '1.6.2' jmsApiVersion = '2.0.1' jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.2.1' - jrubyVersion = '9.1.16.0' - jschVersion = '0.1.54' + jrubyVersion = '9.2.4.0' + jschVersion = '0.1.55' jsonpathVersion = '2.4.0' junit4Version = '4.12' junitJupiterVersion = '5.3.2' junitPlatformVersion = '1.3.2' - jythonVersion = '2.5.3' + jythonVersion = '2.7.0' kryoShadedVersion = '3.0.3' - lettuceVersion = '5.1.0.RELEASE' + lettuceVersion = '5.1.3.RELEASE' log4jVersion = '2.11.1' micrometerVersion = '1.1.0' - mockitoVersion = '2.23.0' - mysqlVersion = '8.0.11' + mockitoVersion = '2.23.4' + mysqlVersion = '8.0.13' pahoMqttClientVersion = '1.2.0' - postgresVersion = '42.0.0' + postgresVersion = '42.2.5' reactorNettyVersion = '0.8.3.RELEASE' reactorVersion = '3.2.3.RELEASE' romeToolsVersion = '1.9.0' @@ -136,13 +136,13 @@ subprojects { subproject -> springDataMongoVersion = '2.1.3.RELEASE' springDataRedisVersion = '2.1.3.RELEASE' springGemfireVersion = '2.1.3.RELEASE' - springSecurityVersion = '5.1.1.RELEASE' + springSecurityVersion = '5.1.2.RELEASE' springRetryVersion = '1.2.2.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.3.RELEASE' springWsVersion = '3.0.4.RELEASE' tomcatVersion = "9.0.12" xmlUnitVersion = '1.6' - xstreamVersion = '1.4.10' + xstreamVersion = '1.4.11.1' } eclipse { @@ -565,7 +565,7 @@ project('spring-integration-scripting') { dependencies { compile project(":spring-integration-core") - testCompile("org.jruby:jruby:$jrubyVersion") + testCompile("org.jruby:jruby-complete:$jrubyVersion") testCompile("org.codehaus.groovy:groovy:$groovyVersion") testCompile("org.codehaus.groovy:groovy-jsr223:$groovyVersion") testCompile("org.python:jython-standalone:$jythonVersion") diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java index e2b14fb282..b93d4f9076 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java @@ -38,6 +38,8 @@ import com.jcraft.jsch.ChannelSftp.LsEntry; * * @author David Turanski * @author Gary Russell + * @author Artem Bilan + * * @since 4.3 */ public class SftpTestSupport extends RemoteFileTestSupport { @@ -59,7 +61,7 @@ public class SftpTestSupport extends RemoteFileTestSupport { server = SshServer.setUpDefaultServer(); server.setPasswordAuthenticator((username, password, session) -> true); server.setPort(0); - server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser"))); + server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath())); server.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory())); server.setFileSystemFactory(new VirtualFileSystemFactory(remoteTemporaryFolder.getRoot().toPath())); server.start(); @@ -73,15 +75,15 @@ public class SftpTestSupport extends RemoteFileTestSupport { factory.setUser("foo"); factory.setPassword("foo"); factory.setAllowUnknownKeys(true); - return new CachingSessionFactory(factory); + return new CachingSessionFactory<>(factory); } @AfterClass public static void stopServer() throws Exception { server.stop(); - File hostkey = new File("hostkey.ser"); - if (hostkey.exists()) { - hostkey.delete(); + File hostKey = new File("hostkey.ser"); + if (hostKey.exists()) { + hostKey.delete(); } } diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java index 65c2d0d842..595c36ec80 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java @@ -32,10 +32,8 @@ import java.security.spec.RSAPublicKeySpec; import java.util.Arrays; import java.util.Collections; -import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory; import org.apache.sshd.server.SshServer; -import org.apache.sshd.server.command.Command; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory; import org.junit.Test; @@ -65,8 +63,8 @@ public class SftpServerTests { try { server.setPasswordAuthenticator((arg0, arg1, arg2) -> true); server.setPort(0); - server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser"))); - server.setSubsystemFactories(Collections.>singletonList(new SftpSubsystemFactory())); + server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath())); + server.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory())); final String pathname = System.getProperty("java.io.tmpdir") + File.separator + "sftptest" + File.separator; new File(pathname).mkdirs(); server.setFileSystemFactory(new VirtualFileSystemFactory(Paths.get(pathname))); @@ -103,7 +101,7 @@ public class SftpServerTests { try { server.setPublickeyAuthenticator((username, key, session) -> key.equals(allowedKey)); server.setPort(0); - server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser"))); + server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath())); server.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory())); final String pathname = System.getProperty("java.io.tmpdir") + File.separator + "sftptest" + File.separator; new File(pathname).mkdirs(); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java index 6ffa6f9a47..3c22adaa92 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java @@ -48,6 +48,7 @@ import com.jcraft.jsch.UserInfo; /** * @author Gary Russell * @author Artem Bilan + * * @since 3.0.2 */ public class SftpSessionFactoryTests { @@ -62,7 +63,7 @@ public class SftpSessionFactoryTests { try { server.setPasswordAuthenticator((arg0, arg1, arg2) -> true); server.setPort(0); - server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser"))); + server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath())); server.start(); DefaultSftpSessionFactory f = new DefaultSftpSessionFactory(); @@ -108,7 +109,7 @@ public class SftpSessionFactoryTests { } @Test - public void testPasswordPassPhraseViaUserInfo() throws Exception { + public void testPasswordPassPhraseViaUserInfo() { DefaultSftpSessionFactory f = new DefaultSftpSessionFactory(); f.setUser("user"); f.setAllowUnknownKeys(true); @@ -213,7 +214,7 @@ public class SftpSessionFactoryTests { server.setPublickeyAuthenticator((username, key, session) -> true); server.setPort(0); server.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory())); - server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser"))); + server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath())); server.start(); DefaultSftpSessionFactory f = new DefaultSftpSessionFactory();