This is an automated email from the ASF dual-hosted git repository.
jerrypeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new c44294d cleaning up pom for pulsar-client-schema (#3175)
c44294d is described below
commit c44294d180e870362b7b3e44e32c5dc86f640542
Author: Boyang Jerry Peng <jerry.boyang.p...@gmail.com>
AuthorDate: Wed Dec 12 18:59:32 2018 -0800
cleaning up pom for pulsar-client-schema (#3175)
* cleaning up pom for pulsar-client-schema
* fix license issue
---
pulsar-client-schema/pom.xml | 150 +++------------------------------
pulsar-sql/presto-distribution/LICENSE | 1 -
2 files changed, 11 insertions(+), 140 deletions(-)
diff --git a/pulsar-client-schema/pom.xml b/pulsar-client-schema/pom.xml
index 433037f..5e90779 100644
--- a/pulsar-client-schema/pom.xml
+++ b/pulsar-client-schema/pom.xml
@@ -62,7 +62,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf3.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -70,12 +70,6 @@
<artifactId>jackson-module-jsonSchema</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
-
<!-- Testing dependencies -->
<dependency>
<groupId>org.apache.pulsar</groupId>
@@ -127,33 +121,8 @@
<artifactSet>
<includes>
-
<include>org.apache.commons:commons-lang3</include>
-
<include>commons-codec:commons-codec</include>
-
<include>commons-collections:commons-collections</include>
- <include>org.asynchttpclient:*</include>
-
<include>org.reactivestreams:reactive-streams</include>
- <include>org.javassist:javassist</include>
- <include>com.google.guava:guava</include>
-
<include>com.google.code.gson:gson</include>
-
<include>com.fasterxml.jackson.core</include>
-
<include>org.apache.bookkeeper:circe-checksum</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>
+ <!--Json schema transitive dependencies-->
<include>com.fasterxml.jackson.*:*</include>
- <include>io.grpc:*</include>
- <include>com.yahoo.datasketches:*</include>
- <include>com.squareup.*:*</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.objenesis:*</include>
- <include>org.yaml:snakeyaml</include>
<include>org.apache.avro:*</include>
<!-- Avro transitive dependencies-->
@@ -163,89 +132,16 @@
<include>org.xerial.snappy:snappy-java</include>
<include>org.apache.commons:commons-compress</include>
<include>org.tukaani:xz</include>
+ <include>org.objenesis:*</include>
</includes>
</artifactSet>
- <filters>
- <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.guava</pattern>
-
<shadedPattern>org.apache.pulsar.shade.com.google.guava</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google.code</pattern>
-
<shadedPattern>org.apache.pulsar.shade.com.google.code</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google.auth</pattern>
-
<shadedPattern>org.apache.pulsar.shade.com.google.auth</shadedPattern>
- </relocation>
+ <!--Json schema transitive dependencies-->
<relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>org.apache.pulsar.shade.com.fasterxml.jackson</shadedPattern>
</relocation>
- <relocation>
-
<pattern>org.apache.pulsar.policies</pattern>
-
<shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.policies</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>
@@ -262,7 +158,7 @@
<exclude>org.apache.avro.reflect.Union</exclude>
</excludes>
</relocation>
- <!--Avro transitive dependencies-->
+ <!--Avro transitive dependencies-->
<relocation>
<pattern>org.codehaus.jackson</pattern>
<shadedPattern>org.apache.pulsar.shade.org.codehaus.jackson</shadedPattern>
@@ -276,41 +172,17 @@
<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>
+ <pattern>org.apache.commons</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.http</pattern>
-
<shadedPattern>org.apache.pulsar.shade.org.apache.http</shadedPattern>
+ <pattern>org.tukaani</pattern>
+
<shadedPattern>org.apache.pulsar.shade.org.tukaani</shadedPattern>
</relocation>
<relocation>
<pattern>org.objenesis</pattern>
<shadedPattern>org.apache.pulsar.shade.org.objenesis</shadedPattern>
</relocation>
- <relocation>
- <pattern>org.yaml</pattern>
-
<shadedPattern>org.apache.pulsar.shade.org.yaml</shadedPattern>
- </relocation>
</relocations>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
@@ -322,4 +194,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 363d1ae..4d158a4 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -395,7 +395,6 @@ The Apache Software License, Version 2.0
Protocol Buffers License
* Protocol Buffers
- - protobuf-java-3.5.1.jar -- licenses/LICENSE-protobuf.txt
- protobuf-shaded-2.1.0-incubating.jar
BSD 3-clause "New" or "Revised" License
