From 5eab71caaebd415ea59880201e250ff720f4e367 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Fri, 15 Sep 2017 09:01:50 +0100 Subject: [PATCH] Filter for Open Source and Enterprise modules. (#1514) --- constants.properties | 2 +- .../src/main/groovy/net/corda/plugins/Cordformation.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/constants.properties b/constants.properties index c0579dd631..0c4e4ef5b1 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=0.16.3 +gradlePluginsVersion=0.16.4 kotlinVersion=1.1.4 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 235570cf74..60ca278dee 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 @@ -70,8 +70,8 @@ class Cordformation implements Plugin { // We want to filter out anything Corda related or provided by Corda, like kotlin-stdlib and quasar 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 && it.group.contains('net.corda.')) { + // net.corda or com.r3.corda.enterprise may be a core dependency which shouldn't be included in this cordapp so give a warning + if (it.group && (it.group.startsWith('net.corda.') || it.group.startsWith('com.r3.corda.enterprise.'))) { 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")