Merge pull request #899 from openzipkin/unzippable

Fixes IOException in jar -x on shadow jars
openzipkin · Jan 4, 2016 · 28e8539 · 28e8539
2 parents f60f5b8 + ea7d4c4
commit 28e8539
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/zipkin-collector-service/build.gradle b/zipkin-collector-service/build.gradle
@@ -15,6 +15,10 @@ jar.manifest.attributes 'Main-Class': mainClassName
 tasks.build.dependsOn(shadowJar)
 artifacts.zipkinUpload shadowJar
 
+shadowJar {
+    exclude 'META-INF/LICENSE' // jackson's META-INF/LICENSE conflicts with the directory META-INF/license
+}
+
 dependencies {
     compile "com.twitter:finagle-ostrich4_${scalaInterfaceVersion}:${commonVersions.finagle}"
     compile "com.twitter:finagle-thriftmux_${scalaInterfaceVersion}:${commonVersions.finagle}"

diff --git a/zipkin-query-service/build.gradle b/zipkin-query-service/build.gradle
@@ -15,6 +15,10 @@ jar.manifest.attributes 'Main-Class': mainClassName
 tasks.build.dependsOn(shadowJar)
 artifacts.zipkinUpload shadowJar
 
+shadowJar {
+    exclude 'META-INF/LICENSE' // jackson's META-INF/LICENSE conflicts with the directory META-INF/license
+}
+
 dependencies {
     compile "com.twitter:finagle-ostrich4_${scalaInterfaceVersion}:${commonVersions.finagle}"
     compile "com.twitter:finagle-zipkin_${scalaInterfaceVersion}:${commonVersions.finagle}"

diff --git a/zipkin-web/build.gradle b/zipkin-web/build.gradle
@@ -12,6 +12,10 @@ jar.manifest.attributes 'Main-Class': mainClassName
 tasks.build.dependsOn(shadowJar)
 artifacts.zipkinUpload shadowJar
 
+shadowJar {
+  exclude 'META-INF/LICENSE' // jackson's META-INF/LICENSE conflicts with the directory META-INF/license
+}
+
 dependencies {
     compile project(':zipkin-common')
     compile "com.twitter:twitter-server_${scalaInterfaceVersion}:${commonVersions.twitterServer}"