diff --git a/constants.properties b/constants.properties index 164efce188..fac9159f36 100644 --- a/constants.properties +++ b/constants.properties @@ -12,7 +12,8 @@ java8MinUpdateVersion=171 # ***************************************************************# platformVersion=5 guavaVersion=25.1-jre -quasarVersion=0.7.10 +# JDK11 support added in 0.8.0 (https://github.com/puniverse/quasar/issues/317) +quasarVersion=0.8.0 proguardVersion=6.0.3 bouncycastleVersion=1.60 disruptorVersion=3.4.2 diff --git a/lib/quasar.jar b/lib/quasar.jar index 7282d8c8b8..c297550a86 100644 Binary files a/lib/quasar.jar and b/lib/quasar.jar differ diff --git a/node/build.gradle b/node/build.gradle index dce25c4719..abfd4c37f0 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -49,7 +49,7 @@ jib.container { mainClass = "net.corda.node.Corda" args = ['--log-to-console', '--no-local-shell', '--config-file=/config/node.conf'] // The Groovy string needs to be converted to a `java.lang.String` below. - jvmFlags = ['-Xmx1g', "-javaagent:/app/libs/quasar-core-${quasar_version}-jdk8.jar".toString()] + jvmFlags = ['-Xmx1g', "-javaagent:/app/libs/quasar-core-${quasar_version}.jar".toString()] } // Use manual resource copying of log4j2.xml rather than source sets. diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle index 1c4601043b..d944d9f676 100644 --- a/node/capsule/build.gradle +++ b/node/capsule/build.gradle @@ -51,7 +51,7 @@ task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').tasks.jar) { applicationId = "net.corda.node.Corda" // See experimental/quasar-hook/README.md for how to generate. def quasarExcludeExpression = "x(antlr**;bftsmart**;co.paralleluniverse**;com.codahale**;com.esotericsoftware**;com.fasterxml**;com.google**;com.ibm**;com.intellij**;com.jcabi**;com.nhaarman**;com.opengamma**;com.typesafe**;com.zaxxer**;de.javakaffee**;groovy**;groovyjarjarantlr**;groovyjarjarasm**;io.atomix**;io.github**;io.netty**;jdk**;junit**;kotlin**;net.bytebuddy**;net.i2p**;org.apache**;org.assertj**;org.bouncycastle**;org.codehaus**;org.crsh**;org.dom4j**;org.fusesource**;org.h2**;org.hamcrest**;org.hibernate**;org.jboss**;org.jcp**;org.joda**;org.junit**;org.mockito**;org.objectweb**;org.objenesis**;org.slf4j**;org.w3c**;org.xml**;org.yaml**;reflectasm**;rx**;org.jolokia**;com.lmax**;picocli**;liquibase**;com.github.benmanes**;org.json**;org.postgresql**;nonapi.io.github.classgraph**)" - javaAgents = ["quasar-core-${quasar_version}-jdk8.jar=${quasarExcludeExpression}"] + javaAgents = ["quasar-core-${quasar_version}.jar=${quasarExcludeExpression}"] systemProperties['visualvm.display.name'] = 'Corda' minJavaVersion = '1.8.0' minUpdateVersion['1.8'] = java8_minUpdateVersion diff --git a/webserver/webcapsule/build.gradle b/webserver/webcapsule/build.gradle index eae2c99121..f8a2eff15a 100644 --- a/webserver/webcapsule/build.gradle +++ b/webserver/webcapsule/build.gradle @@ -48,7 +48,7 @@ task buildWebserverJar(type: FatCapsule, dependsOn: project(':node').tasks.jar) capsuleManifest { applicationVersion = corda_release_version - javaAgents = ["quasar-core-${quasar_version}-jdk8.jar"] + javaAgents = ["quasar-core-${quasar_version}.jar"] systemProperties['visualvm.display.name'] = 'Corda Webserver' minJavaVersion = '1.8.0' minUpdateVersion['1.8'] = java8_minUpdateVersion