From 1c2d6d81009c06451dd0d6e2b254504a15f83908 Mon Sep 17 00:00:00 2001 From: cburlinchon Date: Thu, 10 May 2018 10:01:37 +0100 Subject: [PATCH] Unrevert artemis upgrade to 2.5.0 (#3029) (#815) * Revert "Revert "artemis upgrade to 2.5.0 (#3029)"" --- bridge/build.gradle | 1 + build.gradle | 4 ++-- node-api/build.gradle | 3 +++ node/build.gradle | 3 --- .../kotlin/net/corda/testing/node/internal/RPCDriver.kt | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bridge/build.gradle b/bridge/build.gradle index 12c5286605..a02dabca6a 100644 --- a/bridge/build.gradle +++ b/bridge/build.gradle @@ -74,6 +74,7 @@ dependencies { compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version" compile "org.apache.logging.log4j:log4j-core:$log4j_version" compile "org.slf4j:jul-to-slf4j:$slf4j_version" + compile "org.slf4j:jcl-over-slf4j:$slf4j_version" // JOpt: for command line flags. compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version" diff --git a/build.gradle b/build.gradle index cb81b83978..be582e47ac 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ buildscript { * The issue has been reported to upstream: * https://issues.apache.org/jira/browse/ARTEMIS-1559 */ - ext.artemis_version = '2.2.0' + ext.artemis_version = '2.5.0' ext.jackson_version = '2.9.3' ext.jetty_version = '9.4.7.v20170914' ext.jersey_version = '2.25' @@ -61,7 +61,7 @@ buildscript { ext.caffeine_version = constants.getProperty("caffeineVersion") ext.metrics_version = constants.getProperty("metricsVersion") ext.okhttp_version = '3.5.0' - ext.netty_version = '4.1.9.Final' + ext.netty_version = '4.1.22.Final' ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion") ext.fileupload_version = '1.3.3' ext.junit_version = '4.12' diff --git a/node-api/build.gradle b/node-api/build.gradle index 5e8e4c6852..773da11eb5 100644 --- a/node-api/build.gradle +++ b/node-api/build.gradle @@ -30,6 +30,9 @@ dependencies { compile "org.apache.activemq:artemis-core-client:${artemis_version}" compile "org.apache.activemq:artemis-commons:${artemis_version}" + // Netty: All of it. + compile "io.netty:netty-all:$netty_version" + // For adding serialisation of file upload streams to RPC // TODO: Remove this dependency and the code that requires it compile "commons-fileupload:commons-fileupload:$fileupload_version" diff --git a/node/build.gradle b/node/build.gradle index 4258862288..6beecc4333 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -161,9 +161,6 @@ dependencies { compile 'io.atomix.copycat:copycat-server:1.2.8' compile 'io.atomix.catalyst:catalyst-netty:1.2.1' - // Netty: All of it. - compile "io.netty:netty-all:$netty_version" - // OkHTTP: Simple HTTP library. compile "com.squareup.okhttp3:okhttp:$okhttp_version" diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt index 233e91a97a..cbda711078 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt @@ -58,7 +58,7 @@ import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy import org.apache.activemq.artemis.core.settings.impl.AddressSettings -import org.apache.activemq.artemis.spi.core.remoting.Connection +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager3 import java.lang.reflect.Method import java.nio.file.Path @@ -155,11 +155,11 @@ fun rpcDriver( private class SingleUserSecurityManager(val rpcUser: User) : ActiveMQSecurityManager3 { override fun validateUser(user: String?, password: String?) = isValid(user, password) override fun validateUserAndRole(user: String?, password: String?, roles: MutableSet?, checkType: CheckType?) = isValid(user, password) - override fun validateUser(user: String?, password: String?, connection: Connection?): String? { + override fun validateUser(user: String?, password: String?, connection: RemotingConnection?): String? { return validate(user, password) } - override fun validateUserAndRole(user: String?, password: String?, roles: MutableSet?, checkType: CheckType?, address: String?, connection: Connection?): String? { + override fun validateUserAndRole(user: String?, password: String?, roles: MutableSet?, checkType: CheckType?, address: String?, connection: RemotingConnection?): String? { return validate(user, password) }