From 2b3f6d970147b12fdb7e2e4c94af7eee4bf6c798 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Thu, 6 Jul 2017 15:15:47 +0100 Subject: [PATCH] Revert "Cordapps now exclude the META-INF of dependencies." This reverts commit 68068e5640cf6c00ec452b2ed95bc3b4006b2f3f. --- constants.properties | 2 +- .../src/main/groovy/net/corda/plugins/Cordformation.groovy | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/constants.properties b/constants.properties index 6993620217..eebbf86a14 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=0.13.2 +gradlePluginsVersion=0.13.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 413f05faa5..6d41b9d370 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,9 +24,7 @@ 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).matching { exclude { it.path.contains('META-INF') } } - }.flatten() + project.tasks.jar.from getDirectNonCordaDependencies(project).collect { project.zipTree(it) }.flatten() } } project.tasks.jar.dependsOn task