You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/01/30 17:08:24 UTC
[GitHub] merlimat closed pull request #1095: Publish pulsar-client-admin as a shaded artifact
merlimat closed pull request #1095: Publish pulsar-client-admin as a shaded artifact
URL: https://github.com/apache/incubator-pulsar/pull/1095
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index 11797a49c..a98b6edfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@ flexible messaging model and an intuitive client API.</description>
<module>pulsar-broker</module>
<module>pulsar-broker-shaded</module>
<module>pulsar-client-admin</module>
+ <module>pulsar-client-admin-shaded</module>
<module>pulsar-client-tools</module>
<module>pulsar-client</module>
<module>pulsar-client-shaded</module>
diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml
index 17230dc95..371105a72 100644
--- a/pulsar-broker-shaded/pom.xml
+++ b/pulsar-broker-shaded/pom.xml
@@ -66,7 +66,7 @@
<include>org.apache.pulsar:pulsar-common</include>
<include>org.apache.pulsar:pulsar-client</include>
<include>org.apache.pulsar:pulsar-client-original</include>
- <include>org.apache.pulsar:pulsar-client-admin</include>
+ <include>org.apache.pulsar:pulsar-client-admin-original</include>
<include>com.google.guava:guava</include>
<include>org.apache.pulsar:pulsar-broker-common</include>
<include>org.apache.bookkeeper:bookkeeper-server</include>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index d6fd3e26a..6964295b6 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-client-admin</artifactId>
+ <artifactId>pulsar-client-admin-original</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
new file mode 100644
index 000000000..6a2f406fc
--- /dev/null
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -0,0 +1,194 @@
+<?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>1.22.0-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>pulsar-client-admin</artifactId>
+ <name>Pulsar Client Admin</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>pulsar-client-admin-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-client-original</include>
+ <include>org.apache.pulsar:pulsar-client-admin-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>org.apache.pulsar:pulsar-checksum</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>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>net.jpountz.lz4:lz4</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.admin.shade.org.asynchttpclient</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.apache.commons</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.com.google</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.com.fasterxml.jackson</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>io.netty</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.io.netty</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.pulsar.common</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.apache.pulsar.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.pulsar.policies</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.apache.pulsar.policies</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.pulsar.checksum</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.apache.pulsar.checksum</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.scurrilous.circe</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.com.scurrilous.circe</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>net.jpountz</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.net.jpountz</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.yahoo</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.com.yahoo</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.typesafe</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.com.typesafe</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.glassfish</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.glassfish</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.ws</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.javax.ws</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.annotation</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.javax.annotation</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>jersey</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.jersey</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.jvnet</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.jvnet</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.aopalliance</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.aopalliance</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javassist</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.javassist</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.inject</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.javax.inject</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.reactivestreams</pattern>
+ <shadedPattern>org.apache.pulsar.admin.shade.org.reactivestreams</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml
index c692f0833..1751af3ce 100644
--- a/pulsar-client-admin/pom.xml
+++ b/pulsar-client-admin/pom.xml
@@ -30,8 +30,8 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>pulsar-client-admin</artifactId>
- <name>Pulsar Client Admin</name>
+ <artifactId>pulsar-client-admin-original</artifactId>
+ <name>Pulsar Client Admin Original</name>
<dependencies>
<dependency>
@@ -76,62 +76,4 @@
<artifactId>gson</artifactId>
</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>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>shaded</shadedClassifierName>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-
- <artifactSet>
- <includes>
- <include>org.apache.commons:commons-lang3</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>org.asynchttpclient:async-http-client</include>
- <include>com.google.protobuf:protobuf-java</include>
- <include>com.google.guava:guava</include>
- <include>com.google.code.gson:gson</include>
- <include>io.netty:netty</include>
- <include>io.netty:netty-all</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.apache.commons</pattern>
- <shadedPattern>pulsar-admin-shade.org.apache.commons</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.asynchttpclient</pattern>
- <shadedPattern>org.apache.pulsar.shade.org.asynchttpclient</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google</pattern>
- <shadedPattern>pulsar-admin-shade.com.google</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.jboss.netty</pattern>
- <shadedPattern>pulsar-admin-shade.org.jboss.netty</shadedPattern>
- </relocation>
- <relocation>
- <pattern>io.netty</pattern>
- <shadedPattern>pulsar-admin-shade.io.netty</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/pulsar-client-tools/pom.xml b/pulsar-client-tools/pom.xml
index 0a33410a6..8c911ef9c 100644
--- a/pulsar-client-tools/pom.xml
+++ b/pulsar-client-tools/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-client-admin</artifactId>
+ <artifactId>pulsar-client-admin-original</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
diff --git a/pulsar-testclient/pom.xml b/pulsar-testclient/pom.xml
index c6eaab809..472d6e98e 100644
--- a/pulsar-testclient/pom.xml
+++ b/pulsar-testclient/pom.xml
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-client-admin</artifactId>
+ <artifactId>pulsar-client-admin-original</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services