This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new b0292a1 adding a module that shades managed-ledge (#2034)
b0292a1 is described below
commit b0292a182d768b2fead6e433e208e9f59602f24f
Author: Boyang Jerry Peng <[email protected]>
AuthorDate: Tue Jun 26 15:31:15 2018 -0700
adding a module that shades managed-ledge (#2034)
* adding a module that shades managed-ledger
* removing commented out lines
---
managed-ledger-shaded/pom.xml | 291 +++++++++++++++++++++
managed-ledger/pom.xml | 2 +-
pom.xml | 1 +
pulsar-broker-auth-athenz/pom.xml | 2 +-
pulsar-broker/pom.xml | 4 +-
.../pulsar-client-kafka-tests/pom.xml | 2 +-
.../pulsar-client-kafka/pom.xml | 2 +-
pulsar-client-tools-test/pom.xml | 2 +-
pulsar-discovery-service/pom.xml | 4 +-
pulsar-proxy/pom.xml | 2 +-
pulsar-spark/pom.xml | 2 +-
pulsar-storm/pom.xml | 2 +-
pulsar-testclient/pom.xml | 2 +-
pulsar-websocket/pom.xml | 2 +-
pulsar-zookeeper-utils/pom.xml | 4 +-
tests/integration/s3-offload/pom.xml | 2 +-
16 files changed, 309 insertions(+), 17 deletions(-)
diff --git a/managed-ledger-shaded/pom.xml b/managed-ledger-shaded/pom.xml
new file mode 100644
index 0000000..3ec3b46
--- /dev/null
+++ b/managed-ledger-shaded/pom.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
+ xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar</artifactId>
+ <version>2.2.0-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>managed-ledger</artifactId>
+ <name>Managed Ledger</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>managed-ledger-original</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+
<createDependencyReducedPom>true</createDependencyReducedPom>
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+
+ <artifactSet>
+ <includes>
+
<include>org.apache.pulsar:pulsar-functions-proto</include>
+
<include>org.apache.pulsar:pulsar-io-core</include>
+
<include>org.apache.pulsar:pulsar-client-original</include>
+
<include>org.apache.pulsar:pulsar-client-admin-original</include>
+
<include>org.apache.pulsar:managed-ledger-original</include>
+
<include>org.apache.commons:commons-lang3</include>
+
<include>commons-codec:commons-codec</include>
+
<include>commons-collections:commons-collections</include>
+] <include>org.asynchttpclient:*</include>
+
<include>io.netty:netty-codec-http</include>
+
<include>io.netty:netty-transport-native-epoll</include>
+
<include>org.reactivestreams:reactive-streams</include>
+
<include>com.typesafe.netty:netty-reactive-streams</include>
+ <include>org.javassist:javassist</include>
+
<include>com.google.protobuf:protobuf-java</include>
+ <include>com.google.guava:guava</include>
+
<include>com.google.code.gson:gson</include>
+
<include>com.fasterxml.jackson.core</include>
+ <include>io.netty:netty</include>
+ <include>io.netty:netty-all</include>
+
<include>org.apache.pulsar:pulsar-common</include>
+ <include>net.jpountz.lz4:lz4</include>
+
<include>com.yahoo.datasketches:sketches-core</include>
+ <include>org.glassfish.jersey*:*</include>
+ <include>javax.ws.rs:*</include>
+ <include>javax.annotation:*</include>
+ <include>org.glassfish.hk2*:*</include>
+
<include>com.fasterxml.jackson.*:*</include>
+ <include>io.grpc:*</include>
+ <include>com.yahoo.datasketches:*</include>
+ <include>io.netty:*</include>
+ <include>com.squareup.*:*</include>
+ <include>com.google.*:*</include>
+ <include>commons-*:*</include>
+
<include>org.apache.httpcomponents:*</include>
+ <include>org.eclipse.jetty:*</include>
+ <include>com.google.auth:*</include>
+ <include>org.jvnet.mimepull:*</include>
+ <include>io.opencensus:*</include>
+ <include>org.apache.zookeeper:*</include>
+ <include>org.apache.commons:*</include>
+ <include>net.java.dev.jna:jna</include>
+
<include>org.apache.yetus:audience-annotations</include>
+ <include>org.apache.bookkeeper*:*</include>
+
+ <include>org.apache.avro:*</include>
+ <!-- Avro transitive dependencies-->
+
<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>
+ <artifact>net.jpountz.lz4:lz4</artifact>
+ <includes>
+ <include>**</include>
+ </includes>
+ </filter>
+ <filter>
+
<artifact>org.apache.pulsar:pulsar-io-core</artifact>
+ <includes>
+ <include>**</include>
+ </includes>
+ </filter>
+ <filter>
+
<artifact>org.apache.pulsar:pulsar-client-original</artifact>
+ <includes>
+ <include>**</include>
+ </includes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>org.asynchttpclient</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.asynchttpclient</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google</pattern>
+
<shadedPattern>org.apache.pulsar.shade.com.google</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson</pattern>
+
<shadedPattern>org.apache.pulsar.shade.com.fasterxml.jackson</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>io.netty</pattern>
+
<shadedPattern>org.apache.pulsar.shade.io.netty</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>org.apache.pulsar.policies</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.policies</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>org.apache.pulsar.checksum</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.checksum</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.scurrilous.circe</pattern>
+
<shadedPattern>org.apache.pulsar.shade.com.scurrilous.circe</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>net.jpountz</pattern>
+
<shadedPattern>org.apache.pulsar.shade.net.jpountz</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.yahoo</pattern>
+
<shadedPattern>org.apache.pulsar.shade.com.yahoo</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.typesafe</pattern>
+
<shadedPattern>org.apache.pulsar.shade.com.typesafe</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.glassfish</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.glassfish</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.ws</pattern>
+
<shadedPattern>org.apache.pulsar.shade.javax.ws</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.annotation</pattern>
+
<shadedPattern>org.apache.pulsar.shade.javax.annotation</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>jersey</pattern>
+
<shadedPattern>org.apache.pulsar.shade.jersey</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.jvnet</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.jvnet</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.aopalliance</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.aopalliance</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javassist</pattern>
+
<shadedPattern>org.apache.pulsar.shade.javassist</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.inject</pattern>
+
<shadedPattern>org.apache.pulsar.shade.javax.inject</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.reactivestreams</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.reactivestreams</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.avro</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.avro</shadedPattern>
+ </relocation>
+ <!-- Avro transitive dependencies-->
+ <relocation>
+ <pattern>org.codehaus.jackson</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.codehaus.jackson</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>com.thoughtworks.paranamer</pattern>
+
<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>
+ <relocation>
+ <pattern>io.grpc</pattern>
+
<shadedPattern>org.apache.pulsar.shade.io.grpc</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>okio</pattern>
+
<shadedPattern>org.apache.pulsar.shade.okio</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.squareup</pattern>
+
<shadedPattern>org.apache.pulsar.shade.com.squareup</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>io.opencensus</pattern>
+
<shadedPattern>org.apache.pulsar.shade.io.opencensus</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.eclipse.jetty</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.eclipse.jetty</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.http</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.http</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.bookkeeper</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern>
+ <excludes>
+
<exclude>org.apache.bookkeeper.mledger.**</exclude>
+ </excludes>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.zookeeper</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.zookeeper</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>net.java.dev.jna</pattern>
+
<shadedPattern>org.apache.pulsar.shade.net.java.dev.jna</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.yetus</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.yetus</shadedPattern>
+ </relocation>
+ </relocations>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer"
/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml
index 1c13b9d..b1fe3fa 100644
--- a/managed-ledger/pom.xml
+++ b/managed-ledger/pom.xml
@@ -29,7 +29,7 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<name>Managed Ledger</name>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 309c130..6ed259e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@ flexible messaging model and an intuitive client
API.</description>
<modules>
<module>buildtools</module>
<module>managed-ledger</module>
+ <module>managed-ledger-shaded</module>
<module>pulsar-common</module>
<module>pulsar-broker-common</module>
<module>pulsar-broker</module>
diff --git a/pulsar-broker-auth-athenz/pom.xml
b/pulsar-broker-auth-athenz/pom.xml
index 1921d0f..f32c42d 100644
--- a/pulsar-broker-auth-athenz/pom.xml
+++ b/pulsar-broker-auth-athenz/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 9294725..ccee189 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -93,7 +93,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
</dependency>
@@ -105,7 +105,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml
b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml
index 3ba4244..acd9fdd 100644
--- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml
+++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml
b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml
index 32840f1..1154fd7 100644
--- a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml
+++ b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/pulsar-client-tools-test/pom.xml b/pulsar-client-tools-test/pom.xml
index 02be077..5ed1f9a 100644
--- a/pulsar-client-tools-test/pom.xml
+++ b/pulsar-client-tools-test/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/pulsar-discovery-service/pom.xml b/pulsar-discovery-service/pom.xml
index fe84373..259f0a9 100644
--- a/pulsar-discovery-service/pom.xml
+++ b/pulsar-discovery-service/pom.xml
@@ -52,14 +52,14 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml
index 0ca8039..9e4cd6f 100644
--- a/pulsar-proxy/pom.xml
+++ b/pulsar-proxy/pom.xml
@@ -126,7 +126,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/pulsar-spark/pom.xml b/pulsar-spark/pom.xml
index 6ca98f4..05eec76 100644
--- a/pulsar-spark/pom.xml
+++ b/pulsar-spark/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/pulsar-storm/pom.xml b/pulsar-storm/pom.xml
index 1f1b016..1f33a5a 100644
--- a/pulsar-storm/pom.xml
+++ b/pulsar-storm/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/pulsar-testclient/pom.xml b/pulsar-testclient/pom.xml
index 6bd2c65..ffe9a98 100644
--- a/pulsar-testclient/pom.xml
+++ b/pulsar-testclient/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/pulsar-websocket/pom.xml b/pulsar-websocket/pom.xml
index 816bf5d..3d50d29 100644
--- a/pulsar-websocket/pom.xml
+++ b/pulsar-websocket/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
diff --git a/pulsar-zookeeper-utils/pom.xml b/pulsar-zookeeper-utils/pom.xml
index df6544d..8e8d0a7 100644
--- a/pulsar-zookeeper-utils/pom.xml
+++ b/pulsar-zookeeper-utils/pom.xml
@@ -74,14 +74,14 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/tests/integration/s3-offload/pom.xml
b/tests/integration/s3-offload/pom.xml
index 0ed9c65..c32a996 100644
--- a/tests/integration/s3-offload/pom.xml
+++ b/tests/integration/s3-offload/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>managed-ledger</artifactId>
+ <artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
