ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7095 from corda/adel/ENT-6637

Browse Source 
ENT-6637 & ENT-6618: Removed jgroups and dbcp from artemis dependencies.
This commit is contained in:
Adel El-Beik 2022-03-04 10:51:45 +00:00 committed by GitHub
commit aa9d9288bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -460,6 +460,8 @@ allprojects {
// Netty-All is an uber-jar which contains every Netty module. // Netty-All is an uber-jar which contains every Netty module.
// Exclude it to force us to use the individual Netty modules instead. // Exclude it to force us to use the individual Netty modules instead.
exclude group: 'io.netty', module: 'netty-all' exclude group: 'io.netty', module: 'netty-all'
exclude group: 'org.jgroups', module: 'jgroups'
} }
runtime { runtime {
// We never want isolated.jar on classPath, since we want to test jar being dynamically loaded as an attachment // We never want isolated.jar on classPath, since we want to test jar being dynamically loaded as an attachment

4
node/build.gradle
View File

@ -127,7 +127,9 @@ dependencies {
// TODO: remove the forced update of commons-collections and beanutils when artemis updates them // TODO: remove the forced update of commons-collections and beanutils when artemis updates them
compile "org.apache.commons:commons-collections4:${commons_collections_version}" compile "org.apache.commons:commons-collections4:${commons_collections_version}"
compile "commons-beanutils:commons-beanutils:${beanutils_version}" compile "commons-beanutils:commons-beanutils:${beanutils_version}"
compile "org.apache.activemq:artemis-server:${artemis_version}" compile("org.apache.activemq:artemis-server:${artemis_version}") {
exclude group: 'org.apache.commons', module: 'commons-dbcp2'
}
compile "org.apache.activemq:artemis-core-client:${artemis_version}" compile "org.apache.activemq:artemis-core-client:${artemis_version}"
runtime("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") { runtime("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") {
// Gains our proton-j version from core module. // Gains our proton-j version from core module.