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

CORDA-2333: Updated the majority of the dependencies that were out of date (#5235)

Browse Source 
Some where not touched, including the crypto ones, libraries related to messaging and Kotlin.
This commit is contained in:
Shams Asari 2019-06-20 16:19:16 +01:00 committed by GitHub
parent 843c3a0190
commit 4e835d5483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 64 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml generated
View File

@ -254,6 +254,8 @@
<module name="test-cli_test" target="1.8" />
<module name="test-common_main" target="1.8" />
<module name="test-common_test" target="1.8" />
<module name="test-db_main" target="1.8" />
<module name="test-db_test" target="1.8" />
<module name="test-utils_integrationTest" target="1.8" />
<module name="test-utils_main" target="1.8" />
<module name="test-utils_test" target="1.8" />

41
build.gradle
View File

@ -40,23 +40,23 @@ buildscript {
// We must configure it manually to use the latest capsule version.
ext.capsule_version = '1.0.3'
ext.asm_version = '5.0.4'
ext.asm_version = '7.1'
ext.artemis_version = '2.6.2'
// upgrade Jackson only when corda is using kotlin 1.3.10
// TODO Upgrade Jackson only when corda is using kotlin 1.3.10
ext.jackson_version = '2.9.5'
ext.jetty_version = '9.4.18.v20190429'
ext.jetty_version = '9.4.19.v20190610'
ext.jersey_version = '2.25'
ext.servlet_version = '4.0.1'
ext.assertj_version = '3.12.2'
ext.slf4j_version = '1.7.25'
ext.log4j_version = '2.9.1'
ext.slf4j_version = '1.7.26'
ext.log4j_version = '2.11.2'
ext.bouncycastle_version = constants.getProperty("bouncycastleVersion")
ext.guava_version = constants.getProperty("guavaVersion")
ext.caffeine_version = constants.getProperty("caffeineVersion")
ext.disruptor_version = constants.getProperty("disruptorVersion")
ext.metrics_version = constants.getProperty("metricsVersion")
ext.metrics_new_relic_version = constants.getProperty("metricsNewRelicVersion")
ext.okhttp_version = '3.14.1'
ext.okhttp_version = '3.14.2'
ext.netty_version = '4.1.22.Final'
ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion")
ext.fileupload_version = '1.4'
@ -68,27 +68,26 @@ buildscript {
ext.junit_vintage_version = '5.5.0-RC1'
ext.junit_jupiter_version = '5.5.0-RC1'
ext.junit_platform_version = '1.5.0-RC1'
// TODO Update this to the latest version when hibernate is updated
ext.mockito_version = '2.18.3'
ext.mockito_version = '2.28.2'
ext.mockito_kotlin_version = '1.6.0'
ext.hamkrest_version = '1.7.0.0'
ext.jopt_simple_version = '5.0.2'
ext.jansi_version = '1.14'
ext.hibernate_version = '5.3.10.Final'
ext.h2_version = '1.4.197' // Update docs if renamed or removed.
ext.jansi_version = '1.18'
ext.hibernate_version = '5.4.3.Final'
ext.h2_version = '1.4.199' // Update docs if renamed or removed.
ext.postgresql_version = '42.2.5'
ext.rxjava_version = '1.3.8'
ext.dokka_version = '0.9.17'
ext.dokka_version = '0.9.18'
ext.eddsa_version = '0.2.0'
ext.dependency_checker_version = '4.0.2'
ext.commons_collections_version = '4.1'
ext.commons_collections_version = '4.3'
ext.beanutils_version = '1.9.3'
ext.crash_version = '810d2b774b85d4938be01b9b65e29e4fddbc450b'
ext.jsr305_version = constants.getProperty("jsr305Version")
ext.shiro_version = '1.4.0'
ext.shiro_version = '1.4.1'
ext.artifactory_plugin_version = constants.getProperty('artifactoryPluginVersion')
ext.hikari_version = '2.5.1'
ext.liquibase_version = '3.5.5'
ext.hikari_version = '3.3.1'
ext.liquibase_version = '3.6.3'
ext.artifactory_contextUrl = 'https://ci-artifactory.corda.r3cev.com/artifactory'
ext.snake_yaml_version = constants.getProperty('snakeYamlVersion')
ext.docker_compose_rule_version = '0.35.0'
@ -96,14 +95,16 @@ buildscript {
ext.ghostdriver_version = '2.1.0'
ext.eaagentloader_version = '1.0.3'
ext.proguard_version = constants.getProperty('proguardVersion')
ext.jsch_version = '0.1.54'
ext.commons_cli_version = '1.4'
ext.jsch_version = '0.1.55'
ext.protonj_version = '0.33.0' // Overide Artemis version
ext.snappy_version = '0.4'
ext.class_graph_version = '4.6.12'
ext.class_graph_version = '4.8.41'
ext.jcabi_manifests_version = '1.1'
ext.picocli_version = '3.8.0'
ext.picocli_version = '3.9.6'
ext.commons_io_version = '2.6'
ext.controlsfx_version = '8.40.15'
ext.fontawesomefx_commons_version = '8.15'
ext.fontawesomefx_fontawesome_version = '4.7.0-5'
// Name of the IntelliJ SDK created for the deterministic Java rt.jar.
// ext.deterministic_idea_sdk = '1.8 (Deterministic)'

10
constants.properties
View File

@ -11,15 +11,15 @@ java8MinUpdateVersion=171
# net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. #
# ***************************************************************#
platformVersion=5
guavaVersion=25.1-jre
guavaVersion=28.0-jre
quasarVersion=0.7.10
proguardVersion=6.0.3
proguardVersion=6.1.1
bouncycastleVersion=1.60
disruptorVersion=3.4.2
typesafeConfigVersion=1.3.3
typesafeConfigVersion=1.3.4
jsr305Version=3.0.2
artifactoryPluginVersion=4.7.3
snakeYamlVersion=1.19
caffeineVersion=2.6.2
metricsVersion=3.2.5
caffeineVersion=2.7.0
metricsVersion=4.1.0
metricsNewRelicVersion=1.1.1

4
core/build.gradle
View File

@ -105,10 +105,6 @@ dependencies {
// RxJava: observable streams of events.
compile "io.reactivex:rxjava:$rxjava_version"
// Apache JEXL: An embeddable expression evaluation library.
// This may be temporary until we experiment with other ways to do on-the-fly contract specialisation via an API.
compile "org.apache.commons:commons-jexl3:3.0"
compile "org.apache.commons:commons-lang3:3.9"

15
core/src/test/kotlin/net/corda/core/utilities/EmbeddedExpressionsTest.kt
View File

@ -1,15 +0,0 @@
package net.corda.core.utilities
import org.apache.commons.jexl3.JexlBuilder
import org.apache.commons.jexl3.MapContext
import org.junit.Test
import kotlin.test.assertEquals
class EmbeddedExpressionsTest {
@Test
fun basic() {
val jexl = JexlBuilder().create()
val result = jexl.createExpression("2 + 2").evaluate(MapContext())
assertEquals(4, result)
}
}

6
node/build.gradle
View File

@ -90,8 +90,8 @@ dependencies {
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
// Kryo: object graph serialization.
compile "com.esotericsoftware:kryo:4.0.0"
compile "de.javakaffee:kryo-serializers:0.42"
compile "com.esotericsoftware:kryo:4.0.2"
compile "de.javakaffee:kryo-serializers:0.43"
compile "com.google.guava:guava:$guava_version"
@ -120,7 +120,7 @@ dependencies {
}
// Coda Hale's Metrics: for monitoring of key statistics
compile "io.dropwizard.metrics:metrics-core:$metrics_version"
compile "io.dropwizard.metrics:metrics-jmx:$metrics_version"
// JimFS: in memory java.nio filesystem. Used for test and simulation utilities.
compile "com.google.jimfs:jimfs:1.1"

5
node/src/integration-test/kotlin/net/corda/node/persistence/H2SecurityTests.kt
View File

@ -12,6 +12,7 @@ import net.corda.testing.driver.DriverParameters
import net.corda.testing.driver.driver
import net.corda.testing.driver.internal.incrementalPortAllocation
import net.corda.testing.node.User
import org.h2.jdbc.JdbcSQLNonTransientException
import org.junit.Test
import java.net.InetAddress
import java.sql.DriverManager
@ -96,7 +97,7 @@ class H2SecurityTests {
val port = getFreePort()
startNode(customOverrides = mapOf(h2AddressKey to "localhost:$port", dbPasswordKey to "x")).getOrThrow()
DriverManager.getConnection("jdbc:h2:tcp://localhost:$port/node", "sa", "x").use {
assertFailsWith(org.h2.jdbc.JdbcSQLException::class) {
assertFailsWith(JdbcSQLNonTransientException::class) {
it.createStatement().execute("CREATE ALIAS SET_PROPERTY FOR \"java.lang.System.setProperty\"")
it.createStatement().execute("CALL SET_PROPERTY('abc', '1')")
}
@ -116,7 +117,7 @@ class H2SecurityTests {
it.proxy.startFlow(::MaliciousFlow).returnValue.getOrThrow()
}
DriverManager.getConnection("jdbc:h2:tcp://localhost:$port/node", "sa", "x").use {
assertFailsWith(org.h2.jdbc.JdbcSQLException::class) {
assertFailsWith(JdbcSQLNonTransientException::class) {
it.createStatement().execute("CREATE ALIAS SET_PROPERTY FOR \"java.lang.System.setProperty\"")
it.createStatement().execute("CALL SET_PROPERTY('abc', '1')")
}

6
node/src/main/kotlin/net/corda/node/internal/Node.kt
View File

@ -1,8 +1,8 @@
package net.corda.node.internal
import com.codahale.metrics.JmxReporter
import com.codahale.metrics.MetricFilter
import com.codahale.metrics.MetricRegistry
import com.codahale.metrics.jmx.JmxReporter
import com.github.benmanes.caffeine.cache.Caffeine
import com.palominolabs.metrics.newrelic.AllEnabledMetricAttributeFilter
import com.palominolabs.metrics.newrelic.NewRelicReporter
@ -64,7 +64,7 @@ import net.corda.serialization.internal.*
import net.corda.serialization.internal.amqp.SerializationFactoryCacheKey
import net.corda.serialization.internal.amqp.SerializerFactory
import org.apache.commons.lang3.SystemUtils
import org.h2.jdbc.JdbcSQLException
import org.h2.jdbc.JdbcSQLNonTransientConnectionException
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import rx.Scheduler
@ -405,7 +405,7 @@ open class Node(configuration: NodeConfiguration,
runOnStop += server::stop
val url = try {
server.start().url
} catch (e: JdbcSQLException) {
} catch (e: JdbcSQLNonTransientConnectionException) {
if (e.cause is BindException) {
throw AddressBindingException(effectiveH2Settings.address)
} else {

2
node/src/main/resources/build.properties
View File

@ -2,4 +2,4 @@
# Note: sadly, due to present limitation of IntelliJ-IDEA in processing resource files, these constants cannot be
# imported from top-level 'constants.properties' file
jolokiaAgentVersion=1.6.0
jolokiaAgentVersion=1.6.1

4
samples/irs-demo/build.gradle
View File

@ -1,13 +1,13 @@
buildscript {
ext {
springBootVersion = '1.5.10.RELEASE'
springBootVersion = '1.5.21.RELEASE'
}
repositories {
mavenCentral()
}
dependencies {
classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
classpath "io.spring.gradle:dependency-management-plugin:1.0.7.RELEASE"
classpath "io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE"
}
}

3
samples/irs-demo/cordapp/contracts-irs/build.gradle
View File

@ -8,6 +8,9 @@ dependencies {
cordaRuntime project(':node-api')
cordapp project(':finance:contracts')
// Apache JEXL: An embeddable expression evaluation library.
compile "org.apache.commons:commons-jexl3:3.1"
compile "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
testCompile project(':node-driver')

14
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/CustomCordapp.kt
View File

@ -48,13 +48,15 @@ data class CustomCordapp(
@VisibleForTesting
internal fun packageAsJar(file: Path) {
val classGraph = ClassGraph()
classes.forEach { classGraph.addClassLoader(it.classLoader) }
val scanResult = classGraph
.whitelistPackages(*packages.toTypedArray())
.whitelistClasses(*classes.map { it.name }.toTypedArray())
.pooledScan()
if (packages.isNotEmpty()) {
classGraph.whitelistPaths(*packages.map { it.replace('.', '/') }.toTypedArray())
}
if (classes.isNotEmpty()) {
classes.forEach { classGraph.addClassLoader(it.classLoader) }
classGraph.whitelistClasses(*classes.map { it.name }.toTypedArray())
}
scanResult.use {
classGraph.pooledScan().use { scanResult ->
JarOutputStream(file.outputStream()).use { jos ->
jos.addEntry(testEntry(JarFile.MANIFEST_NAME)) {
createTestManifest(name, versionId, targetPlatformVersion).write(jos)

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/TestCordappImpl.kt
View File

@ -54,7 +54,7 @@ data class TestCordappImpl(val scanPackage: String, override val config: Map<Str
private fun findRootPaths(scanPackage: String): Set<Path> {
return packageToRootPaths.computeIfAbsent(scanPackage) {
val classGraph = ClassGraph().whitelistPackages(scanPackage)
val classGraph = ClassGraph().whitelistPaths(scanPackage.replace('.', '/'))
classGraph.pooledScan().use {
it.allResources
.asSequence()

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/performance/Reporter.kt
View File

@ -1,8 +1,8 @@
package net.corda.testing.node.internal.performance
import com.codahale.metrics.ConsoleReporter
import com.codahale.metrics.JmxReporter
import com.codahale.metrics.MetricRegistry
import com.codahale.metrics.jmx.JmxReporter
import net.corda.testing.node.internal.ShutdownManager
import java.util.concurrent.TimeUnit
import javax.management.ObjectName

4
testing/test-cli/build.gradle
View File

@ -4,8 +4,8 @@ apply plugin: 'kotlin'
dependencies {
compile "info.picocli:picocli:$picocli_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile group: "com.fasterxml.jackson.dataformat", name: "jackson-dataformat-yaml", version: "2.9.0"
compile group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.9.0"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.+"
compile "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"

7
tools/demobench/build.gradle
View File

@ -1,8 +1,7 @@
ext {
tornadofx_version = '1.7.15'
jna_version = '4.1.0'
jna_version = '4.5.2'
purejavacomm_version = '0.0.18'
controlsfx_version = '8.40.12'
java_home = System.properties.'java.home'
pkg_source = "$buildDir/packagesrc"
@ -65,8 +64,8 @@ dependencies {
compile "com.typesafe:config:$typesafe_config_version"
// FontAwesomeFX: icons in the form of a font.
compile "de.jensd:fontawesomefx-fontawesome:4.7.0-5"
compile 'de.jensd:fontawesomefx-commons:8.15'
compile "de.jensd:fontawesomefx-fontawesome:$fontawesomefx_fontawesome_version"
compile "de.jensd:fontawesomefx-commons:$fontawesomefx_commons_version"
// JediTerm: the terminal emulator used in IntelliJ. We have forked it and tweaked it, see https://github.com/corda/jediterm
compile ':terminal-331a005d6793e52cefc9e2cec6774e62d5a546b1'

10
tools/explorer/build.gradle
View File

@ -34,22 +34,20 @@ dependencies {
compileOnly "co.paralleluniverse:capsule:$capsule_version"
// FontAwesomeFX: The "FontAwesome" icon library.
compile 'de.jensd:fontawesomefx-fontawesome:4.7.0'
compile 'de.jensd:fontawesomefx-commons:8.13'
compile "de.jensd:fontawesomefx-fontawesome:$fontawesomefx_fontawesome_version"
compile "de.jensd:fontawesomefx-commons:$fontawesomefx_commons_version"
// ReactFX: Functional reactive UI programming.
compile 'org.reactfx:reactfx:2.0-M5'
compile 'org.fxmisc.easybind:easybind:1.0.3'
// JFXtras: useful widgets including a calendar control.
compile 'org.jfxtras:jfxtras-agenda:8.0-r5'
compile 'org.jfxtras:jfxtras-font-roboto:8.0-r5'
compile 'org.jfxtras:jfxtras-font-roboto:8.0-r6'
// Humanize: formatting
compile 'com.github.mfornos:humanize-icu:1.2.2'
// Controls FX: more java FX components http://fxexperience.com/controlsfx/
compile 'org.controlsfx:controlsfx:8.40.12'
compile "org.controlsfx:controlsfx:$controlsfx_version"
// This provide com.apple.eawt stub for non-mac system.
compile 'com.yuvimasory:orange-extensions:1.3.0'

2
tools/loadtest/build.gradle
View File

@ -9,7 +9,7 @@ dependencies {
compile project(':node-driver')
// https://mvnrepository.com/artifact/com.jcraft/jsch
compile group: 'com.jcraft', name: 'jsch', version: '0.1.54'
compile "com.jcraft:jsch:$jsch_version"
compile group: 'com.jcraft', name: 'jsch.agentproxy.core', version: '0.0.9'
compile group: 'com.jcraft', name: 'jsch.agentproxy.sshagent', version: '0.0.9'
compile group: 'com.jcraft', name: 'jsch.agentproxy.usocket-jna', version: '0.0.9'

3
tools/network-bootstrapper/build.gradle
View File

@ -1,6 +1,5 @@
ext {
tornadofx_version = '1.7.15'
controlsfx_version = '8.40.12'
}
apply plugin: 'kotlin'
@ -23,7 +22,7 @@ configurations {
}
dependencies {
compile "com.microsoft.azure:azure:1.8.0"
compile "com.microsoft.azure:azure:1.22.0"
compile "com.github.docker-java:docker-java:3.0.6"
testCompile "org.jetbrains.kotlin:kotlin-test"