diff --git a/constants.properties b/constants.properties index 8f2e5e8d77..254b42c74d 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=0.14.0 +gradlePluginsVersion=0.14.1 kotlinVersion=1.1.1 guavaVersion=21.0 bouncycastleVersion=1.57 diff --git a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy index 638d532e03..235570cf74 100644 --- a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy +++ b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Cordformation.groovy @@ -71,12 +71,12 @@ class Cordformation implements Plugin { def filteredDeps = directDeps.findAll { excludes.collect { exclude -> (exclude.group == it.group) && (exclude.name == it.name) }.findAll { it }.isEmpty() } filteredDeps.each { // net.corda may be a core dependency which shouldn't be included in this cordapp so give a warning - if(it.group.contains('net.corda')) { + if(it.group && it.group.contains('net.corda.')) { logger.warn("You appear to have included a Corda platform component ($it) using a 'compile' or 'runtime' dependency." + "This can cause node stability problems. Please use 'corda' instead." + "See http://docs.corda.net/cordapp-build-systems.html") } else { - logger.trace("Including dependency: $it") + logger.info("Including dependency in CorDapp JAR: $it") } } return filteredDeps.collect { configurations.runtime.files it }.flatten().toSet()