diff --git a/build.gradle b/build.gradle index 46e3956b41..49eae46bda 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ buildscript { // For sharing constants between builds Properties constants = new Properties() file("$projectDir/constants.properties").withInputStream { constants.load(it) } - file("${project(':node').projectDir}/src/main/resources/build.properties").withInputStream { constants.load(it) } // Our version: bump this on release. ext.corda_release_version = "3.0-SNAPSHOT" @@ -41,7 +40,6 @@ buildscript { ext.jackson_version = '2.9.3' ext.jetty_version = '9.4.7.v20170914' ext.jersey_version = '2.25' - ext.jolokia_version = constants.getProperty("jolokiaAgentVersion") ext.assertj_version = '3.8.0' ext.slf4j_version = '1.7.25' ext.log4j_version = '2.9.1' diff --git a/node/build.gradle b/node/build.gradle index 50130933af..8b06b452c4 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -9,6 +9,14 @@ apply plugin: 'com.jfrog.artifactory' description 'Corda node modules' +// Import private compile time constants +buildscript { + def properties = new Properties() + file("$projectDir/src/main/resources/build.properties").withInputStream { properties.load(it) } + + ext.jolokia_version = properties.getProperty('jolokiaAgentVersion') +} + //noinspection GroovyAssignabilityCheck configurations { compile { diff --git a/webserver/build.gradle b/webserver/build.gradle index e0f66a360c..3715cfaf67 100644 --- a/webserver/build.gradle +++ b/webserver/build.gradle @@ -38,7 +38,6 @@ dependencies { compile "org.eclipse.jetty:jetty-servlet:$jetty_version" compile "org.eclipse.jetty:jetty-webapp:$jetty_version" compile "javax.servlet:javax.servlet-api:3.1.0" - compile "org.jolokia:jolokia-war:$jolokia_version" compile "commons-fileupload:commons-fileupload:$fileupload_version" // Log4J: logging framework (with SLF4J bindings)