Skip to content

Commit 50c5c23

Browse files
authored
Merge pull request #965: Fix zstd
2 parents e371111 + 2d38fb6 commit 50c5c23

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

direct/io-kafka/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ enableShadowJar(project) {
5656
if (!it.endsWith(".class")) {
5757
return true
5858
}
59-
def allowed = ["cz/o2/proxima", "META-INF"]
59+
def allowed = ["cz/o2/proxima", "com/github/luben", "META-INF"]
6060
if (allowed.find { s -> it.startsWith(s) } != null) {
6161
return true
6262
}
@@ -67,7 +67,7 @@ enableShadowJar(project) {
6767
shadowJar {
6868
["org.apache.kafka", "net.sf", "com.yammer", "scala", "com.101tec",
6969
"org.apache.zookeeper", "com.google", "com.fasterxml", "org.xerial",
70-
"net.jpountz", "com.github.luben"].each {
70+
"net.jpountz"].each {
7171

7272
relocate it, "cz.o2.proxima.kafka.shaded.${it}"
7373
}

direct/io-pubsub/module/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ enableShadowJar(project) {
3939
if (!it.endsWith(".class")) {
4040
return true
4141
}
42-
def allowed = ["cz/o2/proxima", "com/sun", "META-INF"]
42+
def allowed = ["cz/o2/proxima", "com/sun", "org/conscrypt", "META-INF"]
4343
if (allowed.find { s -> it.startsWith(s) } != null) {
4444
return true
4545
}
@@ -62,7 +62,7 @@ shadowJar {
6262

6363
["io.grpc", "io.opencensus", "com.google", "com.fasterxml",
6464
"org.apache.commons", "org.codehaus", "org.apache", "org.threeten",
65-
"io.perfmark", "org.conscrypt"].each {
65+
"io.perfmark"].each {
6666

6767
relocate it, "cz.o2.proxima.pubsub.shaded.${it}"
6868
}

0 commit comments

Comments
 (0)