This is an automated email from the ASF dual-hosted git repository. guangning pushed a commit to branch branch-2.5 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 1493d16d319137b8400fa23d65575d935e9be5ee Author: Yijie Shen <[email protected]> AuthorDate: Fri Feb 21 14:20:14 2020 +0800 [Pulsar-Client] Stop shade snappy-java in pulsar-client-shaded (#6375) Fixes #6260 Snappy, like other compressions (LZ4, ZSTD), depends on native libraries to do the real encode/decode stuff. When we shade them in a fat jar, only the java implementations of snappy class are shaded, however, left the JNI incompatible with the underlying c++ code. We should just remove the shade for snappy, and let maven import its lib as a dependency. I've tested the shaded jar locally generated by this pr, it works for all compression codecs. --- pulsar-broker-shaded/pom.xml | 5 ----- pulsar-client-all/pom.xml | 5 ----- .../pulsar-client-kafka-shaded/pom.xml | 19 ++++++---------- .../pulsar-client-kafka-shaded_0_8/pom.xml | 23 +++++++------------- .../pulsar-client-kafka-shaded_0_9/pom.xml | 25 ++++++++-------------- pulsar-client-shaded/pom.xml | 5 ----- 6 files changed, 23 insertions(+), 59 deletions(-) diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml index b137712..55eede2 100644 --- a/pulsar-broker-shaded/pom.xml +++ b/pulsar-broker-shaded/pom.xml @@ -105,7 +105,6 @@ <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> <include>com.thoughtworks.paranamer:paranamer</include> - <include>org.xerial.snappy:snappy-java</include> <include>org.apache.commons:commons-compress</include> <include>org.tukaani:xz</include> </includes> @@ -312,10 +311,6 @@ <shadedPattern>org.apache.pulsar.shade.com.thoughtworks.paranamer</shadedPattern> </relocation> <relocation> - <pattern>org.xerial.snappy</pattern> - <shadedPattern>org.apache.pulsar.shade.org.xerial.snappy</shadedPattern> - </relocation> - <relocation> <pattern>org.tukaani</pattern> <shadedPattern>org.apache.pulsar.shade.org.tukaani</shadedPattern> </relocation> diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index e1b3628..e029ec3 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -147,7 +147,6 @@ <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> <include>com.thoughtworks.paranamer:paranamer</include> - <include>org.xerial.snappy:snappy-java</include> <include>org.apache.commons:commons-compress</include> <include>org.tukaani:xz</include> <include>org.apache.bookkeeper:bookkeeper-common-allocator</include> @@ -313,10 +312,6 @@ <shadedPattern>org.apache.pulsar.shade.com.thoughtworks.paranamer</shadedPattern> </relocation> <relocation> - <pattern>org.xerial.snappy</pattern> - <shadedPattern>org.apache.pulsar.shade.org.xerial.snappy</shadedPattern> - </relocation> - <relocation> <pattern>org.apache.commons</pattern> <shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern> </relocation> diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml index f67d078..1dd146a 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml @@ -103,7 +103,6 @@ <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> <include>com.thoughtworks.paranamer:paranamer</include> - <include>org.xerial.snappy:snappy-java</include> <include>org.apache.commons:commons-compress</include> <include>org.tukaani:xz</include> </includes> @@ -115,6 +114,12 @@ <include>**</include> </includes> </filter> + <filter> + <artifact>org.apache.pulsar:pulsar-client-original</artifact> + <includes> + <include>**</include> + </includes> + </filter> </filters> <relocations> <relocation> @@ -218,10 +223,6 @@ <shadedPattern>org.apache.pulsar.shade.com.thoughtworks.paranamer</shadedPattern> </relocation> <relocation> - <pattern>org.xerial.snappy</pattern> - <shadedPattern>org.apache.pulsar.shade.org.xerial.snappy</shadedPattern> - </relocation> - <relocation> <pattern>org.apache.commons</pattern> <shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern> </relocation> @@ -234,14 +235,6 @@ <shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern> </relocation> </relocations> - <filters> - <filter> - <artifact>org.apache.pulsar:pulsar-client-original</artifact> - <includes> - <include>**</include> - </includes> - </filter> - </filters> </configuration> </execution> </executions> diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml index 85b50b3..6c31479 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml @@ -103,18 +103,23 @@ <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> <include>com.thoughtworks.paranamer:paranamer</include> - <include>org.xerial.snappy:snappy-java</include> <include>org.apache.commons:commons-compress</include> <include>org.tukaani:xz</include> </includes> </artifactSet> <filters> - <filter> + <filter> <artifact>commons-logging:commons-logging</artifact> <includes> <include>**</include> </includes> - </filter> + </filter> + <filter> + <artifact>org.apache.pulsar:pulsar-client-original</artifact> + <includes> + <include>**</include> + </includes> + </filter> </filters> <relocations> <relocation> @@ -376,10 +381,6 @@ <shadedPattern>org.apache.pulsar.shade.com.thoughtworks.paranamer</shadedPattern> </relocation> <relocation> - <pattern>org.xerial.snappy</pattern> - <shadedPattern>org.apache.pulsar.shade.org.xerial.snappy</shadedPattern> - </relocation> - <relocation> <pattern>org.apache.commons</pattern> <shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern> </relocation> @@ -392,14 +393,6 @@ <shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern> </relocation> </relocations> - <filters> - <filter> - <artifact>org.apache.pulsar:pulsar-client-original</artifact> - <includes> - <include>**</include> - </includes> - </filter> - </filters> </configuration> </execution> </executions> diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml index 1e248f7..4e616a1 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml @@ -99,18 +99,23 @@ <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> <include>com.thoughtworks.paranamer:paranamer</include> - <include>org.xerial.snappy:snappy-java</include> <include>org.apache.commons:commons-compress</include> <include>org.tukaani:xz</include> </includes> </artifactSet> <filters> - <filter> + <filter> <artifact>commons-logging:commons-logging</artifact> <includes> - <include>**</include> + <include>**</include> </includes> - </filter> + </filter> + <filter> + <artifact>org.apache.pulsar:pulsar-client-original</artifact> + <includes> + <include>**</include> + </includes> + </filter> </filters> <relocations> <relocation> @@ -214,10 +219,6 @@ <shadedPattern>org.apache.pulsar.shade.com.thoughtworks.paranamer</shadedPattern> </relocation> <relocation> - <pattern>org.xerial.snappy</pattern> - <shadedPattern>org.apache.pulsar.shade.org.xerial.snappy</shadedPattern> - </relocation> - <relocation> <pattern>org.apache.commons</pattern> <shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern> </relocation> @@ -230,14 +231,6 @@ <shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern> </relocation> </relocations> - <filters> - <filter> - <artifact>org.apache.pulsar:pulsar-client-original</artifact> - <includes> - <include>**</include> - </includes> - </filter> - </filters> </configuration> </execution> </executions> diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index f32f6af..9dbe92d 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -137,7 +137,6 @@ <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> <include>com.thoughtworks.paranamer:paranamer</include> - <include>org.xerial.snappy:snappy-java</include> <include>org.apache.commons:commons-compress</include> <include>org.tukaani:xz</include> @@ -251,10 +250,6 @@ <shadedPattern>org.apache.pulsar.shade.com.thoughtworks.paranamer</shadedPattern> </relocation> <relocation> - <pattern>org.xerial.snappy</pattern> - <shadedPattern>org.apache.pulsar.shade.org.xerial.snappy</shadedPattern> - </relocation> - <relocation> <pattern>org.apache.commons</pattern> <shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern> </relocation>
