fixing protobuf schema shading issue (apache#2168)

* fixing protobuf schema shading issue
sarvex · Jul 16, 2018 · 7af6374 · 7af6374
1 parent 555dd57
commit 7af6374
Show file tree

Hide file tree

Showing 19 changed files with 403 additions and 158 deletions.
diff --git a/pom.xml b/pom.xml
@@ -82,6 +82,7 @@ flexible messaging model and an intuitive client API.</description>
     <module>pulsar-broker-shaded</module>
     <module>pulsar-client</module>
     <module>pulsar-client-shaded</module>
+    <module>pulsar-client-schema</module>
     <module>pulsar-client-admin</module>
     <module>pulsar-client-admin-shaded</module>
     <module>pulsar-client-tools</module>

diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
@@ -180,6 +180,11 @@
       <artifactId>jackson-jaxrs-json-provider</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jsonSchema</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>

diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
@@ -98,15 +98,6 @@
                   <include>io.opencensus:*</include>
                   <include>org.objenesis:*</include>
                   <include>org.yaml:snakeyaml</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>
@@ -210,27 +201,6 @@
                   <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>

diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml
@@ -68,6 +68,7 @@
                   <include>org.apache.kafka:kafka-clients</include>
                   <include>org.apache.pulsar:pulsar-client-kafka-original</include>
                   <include>org.apache.pulsar:pulsar-client-original</include>
+                  <include>org.apache.pulsar:pulsar-client-schema</include>
                   <include>org.apache.commons:commons-lang3</include>
                   <include>commons-codec:commons-codec</include>
                   <include>commons-collections:commons-collections</include>
@@ -97,15 +98,6 @@
                   <include>commons-*:*</include>
                   <include>org.yaml:snakeyaml</include>
                   <include>org.objenesis:*</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>
@@ -188,27 +180,6 @@
                   <pattern>org.apache.http</pattern>
                   <shadedPattern>org.apache.pulsar.shade.org.apache.http</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>org.eclipse.jetty</pattern>
                    <shadedPattern>org.apache.pulsar.shade.org.eclipse</shadedPattern>