ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-11 15:04:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fwd-merge from OS-4.9

Browse Source
This commit is contained in:
Chris Cochrane 2022-08-01 13:00:57 +01:00
commit 877e00f8d3
No known key found for this signature in database
GPG Key ID: 4D4602B5BBC63950
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.gradle
View File

@ -122,6 +122,7 @@ buildscript {
ext.controlsfx_version = constants.getProperty("controlsfxVersion")
ext.detekt_version = constants.getProperty('detektVersion')
ext.docker_java_version = constants.getProperty("dockerJavaVersion")
ext.commons_configuration2_version = constants.getProperty("commonsConfiguration2Version")
if (JavaVersion.current().isJava8()) {
ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsJava8Version")
ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeJava8Version")
@ -435,7 +436,17 @@ allprojects {
configurations {
all {
resolutionStrategy {
// Demand that everything uses our given version of Netty.
// Force dependencies to use the same version of Kotlin as Corda.
force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
// Force dependencies to use the same version of Guava as Corda.
force "com.google.guava:guava:$guava_version"
// Demand that everything uses our given versions of:
// * Netty
// * Apache commons-configuration2
eachDependency { details ->
if (details.requested.group == 'io.netty' && details.requested.name.startsWith('netty-')) {
if (details.requested.name.startsWith('netty-tcnative')) {
@ -444,6 +455,10 @@ allprojects {
details.useVersion netty_version
}
}
if (details.requested.group == 'org.apache.commons' && details.requested.name == "commons-configuration2") {
details.useVersion commons_configuration2_version
}
}
dependencySubstitution {

2
config/dev/log4j2.xml
View File

@ -202,7 +202,7 @@
<AppenderRef ref="Console-ErrorCode-Selector"/>
<AppenderRef ref="RollingFile-ErrorCode-Appender"/>
</Logger>
<Logger name="org.apache.activemq.artemis.core.server" level="info" additivity="false">
<Logger name="org.apache.activemq.artemis.core.server" level="warn" additivity="false">
<Filters>
<RegexFilter regex=".*AMQ222165.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*AMQ222166.*" onMatch="DENY" onMismatch="NEUTRAL"/>

1
constants.properties
View File

@ -38,6 +38,7 @@ openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4
jolokiaAgentVersion=1.6.1
detektVersion=1.0.1
tcnativeVersion=2.0.48.Final
commonsConfiguration2Version=2.8.0
# ENT-6607 all third party version in here now

2
testing/test-common/src/main/resources/log4j2-test.xml
View File

@ -90,7 +90,7 @@
<AppenderRef ref="Console-ErrorCode-Appender"/>
<AppenderRef ref="RollingFile-ErrorCode-Appender"/>
</Logger>
<Logger name="org.apache.activemq.artemis.core.server" level="info" additivity="false">
<Logger name="org.apache.activemq.artemis.core.server" level="warn" additivity="false">
<Filters>
<RegexFilter regex=".*AMQ222165.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*AMQ222166.*" onMatch="DENY" onMismatch="NEUTRAL"/>