diff --git a/constants.properties b/constants.properties index eebbf86a14..6993620217 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=0.13.1 +gradlePluginsVersion=0.13.2 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 6d41b9d370..6eafcdf3cd 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 @@ -24,7 +24,11 @@ class Cordformation implements Plugin { // Note: project.afterEvaluate did not have full dependency resolution completed, hence a task is used instead def task = project.task('configureCordappFatJar') { doLast { - project.tasks.jar.from getDirectNonCordaDependencies(project).collect { project.zipTree(it) }.flatten() + project.tasks.jar.from(getDirectNonCordaDependencies(project).collect { project.zipTree(it)}) { + exclude "META-INF/*.SF" + exclude "META-INF/*.DSA" + exclude "META-INF/*.RSA" + } } } project.tasks.jar.dependsOn task @@ -43,7 +47,7 @@ class Cordformation implements Plugin { }, filePathInJar).asFile() } - static def getDirectNonCordaDependencies(Project project) { + private static def getDirectNonCordaDependencies(Project project) { def coreCordaNames = ['jfx', 'mock', 'rpc', 'core', 'corda', 'cordform-common', 'corda-webserver', 'finance', 'node', 'node-api', 'node-schemas', 'test-utils', 'jackson', 'verifier', 'webserver', 'capsule', 'webcapsule'] def excludes = coreCordaNames.collect { [group: 'net.corda', name: it] } + [ [group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib'],