ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-10 04:22:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "artemis upgrade to 2.5.0 (#3029)"

Browse Source 
This reverts commit c3e6b39
This commit is contained in:
szymonsztuka 2018-05-02 13:47:19 +01:00
parent b19dac02c4
commit 37b715c955
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -48,7 +48,7 @@ buildscript {
* The issue has been reported to upstream: * The issue has been reported to upstream:
* https://issues.apache.org/jira/browse/ARTEMIS-1559 * https://issues.apache.org/jira/browse/ARTEMIS-1559
*/ */
ext.artemis_version = '2.5.0' ext.artemis_version = '2.2.0'
ext.jackson_version = '2.9.3' ext.jackson_version = '2.9.3'
ext.jetty_version = '9.4.7.v20170914' ext.jetty_version = '9.4.7.v20170914'
ext.jersey_version = '2.25' ext.jersey_version = '2.25'
@ -61,7 +61,7 @@ buildscript {
ext.caffeine_version = constants.getProperty("caffeineVersion") ext.caffeine_version = constants.getProperty("caffeineVersion")
ext.metrics_version = constants.getProperty("metricsVersion") ext.metrics_version = constants.getProperty("metricsVersion")
ext.okhttp_version = '3.5.0' ext.okhttp_version = '3.5.0'
ext.netty_version = '4.1.22.Final' ext.netty_version = '4.1.9.Final'
ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion") ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion")
ext.fileupload_version = '1.3.3' ext.fileupload_version = '1.3.3'
ext.junit_version = '4.12' ext.junit_version = '4.12'

3
node-api/build.gradle
View File

@ -30,9 +30,6 @@ dependencies {
compile "org.apache.activemq:artemis-core-client:${artemis_version}" compile "org.apache.activemq:artemis-core-client:${artemis_version}"
compile "org.apache.activemq:artemis-commons:${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 // For adding serialisation of file upload streams to RPC
// TODO: Remove this dependency and the code that requires it // TODO: Remove this dependency and the code that requires it
compile "commons-fileupload:commons-fileupload:$fileupload_version" compile "commons-fileupload:commons-fileupload:$fileupload_version"

3
node/build.gradle
View File

@ -161,6 +161,9 @@ dependencies {
compile 'io.atomix.copycat:copycat-server:1.2.8' compile 'io.atomix.copycat:copycat-server:1.2.8'
compile 'io.atomix.catalyst:catalyst-netty:1.2.1' compile 'io.atomix.catalyst:catalyst-netty:1.2.1'
// Netty: All of it.
compile "io.netty:netty-all:$netty_version"
// OkHTTP: Simple HTTP library. // OkHTTP: Simple HTTP library.
compile "com.squareup.okhttp3:okhttp:$okhttp_version" compile "com.squareup.okhttp3:okhttp:$okhttp_version"

6
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
View File

@ -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.server.impl.ActiveMQServerImpl
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy
import org.apache.activemq.artemis.core.settings.impl.AddressSettings import org.apache.activemq.artemis.core.settings.impl.AddressSettings
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection import org.apache.activemq.artemis.spi.core.remoting.Connection
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager3 import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager3
import java.lang.reflect.Method import java.lang.reflect.Method
import java.nio.file.Path import java.nio.file.Path
@ -155,11 +155,11 @@ fun <A> rpcDriver(
private class SingleUserSecurityManager(val rpcUser: User) : ActiveMQSecurityManager3 { private class SingleUserSecurityManager(val rpcUser: User) : ActiveMQSecurityManager3 {
override fun validateUser(user: String?, password: String?) = isValid(user, password) override fun validateUser(user: String?, password: String?) = isValid(user, password)
override fun validateUserAndRole(user: String?, password: String?, roles: MutableSet<Role>?, checkType: CheckType?) = isValid(user, password) override fun validateUserAndRole(user: String?, password: String?, roles: MutableSet<Role>?, checkType: CheckType?) = isValid(user, password)
override fun validateUser(user: String?, password: String?, connection: RemotingConnection?): String? { override fun validateUser(user: String?, password: String?, connection: Connection?): String? {
return validate(user, password) return validate(user, password)
} }
override fun validateUserAndRole(user: String?, password: String?, roles: MutableSet<Role>?, checkType: CheckType?, address: String?, connection: RemotingConnection?): String? { override fun validateUserAndRole(user: String?, password: String?, roles: MutableSet<Role>?, checkType: CheckType?, address: String?, connection: Connection?): String? {
return validate(user, password) return validate(user, password)
} }