SDC-12981. Kafka classpath validation failing after upgrading avro-ke…

…y-serializer Change-Id: Ic972120a198d4a2e0afa13ba2269ea434b7f9624 Reviewed-on: https://review.streamsets.net/c/datacollector/+/27815 Tested-by: StreamSets CI <streamsets-ci-spam@streamsets.com> Reviewed-by: Jarcec Cecho <jarcec@streamsets.com>
edp963 · Nov 22, 2019 · bfc88c8 · bfc88c8
1 parent 6d8f77f
commit bfc88c8
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 0 deletions.
diff --git a/apache-kafka_1_0-lib/pom.xml b/apache-kafka_1_0-lib/pom.xml
@@ -34,6 +34,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <avro.version>1.8.1</avro.version>
         <confluent.version>4.0.3</confluent.version>
         <kafka.version>1.0.2</kafka.version>
         <h2.version>1.4.187</h2.version>
@@ -141,6 +142,27 @@
             <version>${confluent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro-mapred</artifactId>
+            <version>${avro.version}</version>
+            <scope>compile</scope>
+            <classifier>hadoop2</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/apache-kafka_1_1-lib/pom.xml b/apache-kafka_1_1-lib/pom.xml
@@ -34,6 +34,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <avro.version>1.8.1</avro.version>
         <kafka.version>1.1.0</kafka.version>
         <confluent.version>4.1.3</confluent.version>
         <h2.version>1.4.187</h2.version>
@@ -141,6 +142,27 @@
             <version>${confluent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro-mapred</artifactId>
+            <version>${avro.version}</version>
+            <scope>compile</scope>
+            <classifier>hadoop2</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/apache-kafka_2_0-lib/pom.xml b/apache-kafka_2_0-lib/pom.xml
@@ -34,6 +34,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <avro.version>1.8.1</avro.version>
         <kafka.version>2.0.1</kafka.version>
         <h2.version>1.4.187</h2.version>
         <tec.version>0.7</tec.version>
@@ -141,6 +142,28 @@
             <version>${confluent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro-mapred</artifactId>
+            <version>${avro.version}</version>
+            <scope>compile</scope>
+            <classifier>hadoop2</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/cdh_kafka_3_1-lib/pom.xml b/cdh_kafka_3_1-lib/pom.xml
@@ -34,6 +34,7 @@
   <packaging>jar</packaging>
 
   <properties>
+    <avro.version>1.8.1</avro.version>
     <kafka.version>1.0.1-kafka-3.1.0</kafka.version>
     <zookeeper.version>3.4.5-cdh5.15.0</zookeeper.version>
     <confluent.version>5.0.3</confluent.version>
@@ -151,6 +152,27 @@
       <artifactId>streamsets-datacollector-sdk</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro-mapred</artifactId>
+      <version>${avro.version}</version>
+      <scope>compile</scope>
+      <classifier>hadoop2</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>