DEVX-1736 Updates Makefile and Docs for 5.5.0 availability (#59)

rspurgeon · web-flow · commit 038364bac62b · 2020-05-04T11:21:45.000-05:00
* DEVX-1736 Updates Makefile and Docs for 5.5.0 availability Also: * explicitly adds required schema registry client library dependency * upgrades avro datagen version to latest * DEVX-1736 Resolves avro dependencies * changes dependnecy to kafka-connect-avro-data instead of converter * removes pom.xml hackery for packaging issues w/ converter usage * removes faulty io.confluent.licenses dependency in codehaus.mojo plugin (changes modeled after other projects using this library)
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ SHELL=/bin/bash -o pipefail
 
 check-dependency = $(if $(shell command -v $(1)),,$(error Make sure $(1) is installed))
 
-CP_VERSION ?= 5.4.1
+CP_VERSION ?= 5.5.0
 OPERATOR_VERSION ?= 0
 
 KAFKA_CONNECT_DATAGEN_VERSION ?= 0.3.1
diff --git a/README.md b/README.md
@@ -65,22 +65,22 @@ A Docker image based on Kafka Connect with the `kafka-connect-datagen` plugin is
 
 If you want to build a local copy of the Docker image with `kafka-connect-datagen`, this project provides a [Dockerfile](Dockerfile-local) that you can reference.
 
-You can create a Docker image packaged with the locally built source by running (for example with the 5.4.1 version of Confluent Platform):
+You can create a Docker image packaged with the locally built source by running (for example with the 5.5.0 version of Confluent Platform):
 ```bash
-make build-docker-from-local CP_VERSION=5.4.1
+make build-docker-from-local CP_VERSION=5.5.0
 ```
 
-This will build the connector from source and create a local image with an aggregate version number.  The aggregate version number is the kafka-connect-datagen connector version number and the Confluent Platform version number separated with a `-`.   The local kafka-connect-datagen version number is defined in the `pom.xml` file, and the Confluent Platform version defined in the [Makefile](Makfile).  An example of the aggregate version number might be: `0.3.1-5.4.1`.
+This will build the connector from source and create a local image with an aggregate version number.  The aggregate version number is the kafka-connect-datagen connector version number and the Confluent Platform version number separated with a `-`.   The local kafka-connect-datagen version number is defined in the `pom.xml` file, and the Confluent Platform version defined in the [Makefile](Makfile).  An example of the aggregate version number might be: `0.3.1-5.5.0`.
 
 Alternatively, you can install the `kafka-connect-datagen` connector from [Confluent Hub](https://www.confluent.io/connector/kafka-connect-datagen/) into a Docker image by running:
 ```bash
-make build-docker-from-released CP_VERSION=5.4.1
+make build-docker-from-released CP_VERSION=5.5.0
 ```
 
 The [Makefile](Makefile) contains some default variables that affect the version numbers of both the installed `kafka-connect-datagen` as well as the base Confluent Platform version.  The variables are located near the top of the [Makefile](Makefile) with the following names and current default values:
 
 ```bash
-CP_VERSION ?= 5.4.1
+CP_VERSION ?= 5.5.0
 
 KAFKA_CONNECT_DATAGEN_VERSION ?= 0.3.1
 ```
@@ -234,9 +234,9 @@ To release new versions of the Docker images to Dockerhub (https://hub.docker.co
 The [Makefile](Makefile) contains some default variables that affect the version numbers of both the installed `kafka-connect-datagen` as well as the base Confluent Platform version.  The variables are located near the top of the [Makefile](Makefile) with the following names and current default values:
 
 ```bash
-CP_VERSION ?= 5.4.1
+CP_VERSION ?= 5.5.0
 KAFKA_CONNECT_DATAGEN_VERSION ?= 0.3.1
-OPERATOR_VERSION ?= 0 # Operator is a 'rev' version appended at the end of the CP version, like so: 5.4.1.0
+OPERATOR_VERSION ?= 0 # Operator is a 'rev' version appended at the end of the CP version, like so: 5.5.0.0
 ```
 
 To publish the https://hub.docker.com/r/cnfldemos/kafka-connect-datagen/ image:
@@ -246,12 +246,12 @@ make push-from-released
 
 and to override the CP Version of the `kafka-connect-datagen` version you can run something similar to:
 ```bash
-CP_VERSION=5.4.1 KAFKA_CONNECT_DATAGEN_VERSION=0.1.4 make publish-cp-kafka-connect-confluenthub
+CP_VERSION=5.5.0 KAFKA_CONNECT_DATAGEN_VERSION=0.1.4 make publish-cp-kafka-connect-confluenthub
 ```
 
 to override the CP Version and the Operator version, which may happen if Operator releases a patch version, you could run something similar to:
 ```bash
-CP_VERSION=5.4.1 OPERATOR_VERSION=1 KAFKA_CONNECT_DATAGEN_VERSION=0.1.4 make push-cp-server-connect-operator-from-released
+CP_VERSION=5.5.0 OPERATOR_VERSION=1 KAFKA_CONNECT_DATAGEN_VERSION=0.1.4 make push-cp-server-connect-operator-from-released
 ```
-which would result in a docker image tagged as: `cp-server-connect-operator-datagen:0.1.4-5.4.1.1` and pushed to DockerHub
+which would result in a docker image tagged as: `cp-server-connect-operator-datagen:0.1.4-5.5.0.1` and pushed to DockerHub
 
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>common-parent</artifactId>
-        <version>5.4.1</version>
+        <version>5.5.0</version>
     </parent>
 
     <groupId>io.confluent.kafka.connect</groupId>
@@ -31,7 +31,7 @@
 
     <properties>
         <connect-runtime-version>2.0.0</connect-runtime-version>
-        <confluent.avro.generator.version>0.3.0</confluent.avro.generator.version>
+        <confluent.avro.generator.version>0.3.1</confluent.avro.generator.version>
         <junit.version>4.12</junit.version>
         <avro.version>1.8.1</avro.version>
         <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
@@ -93,14 +93,9 @@
         </dependency>
         <dependency>
             <groupId>io.confluent</groupId>
-            <artifactId>kafka-connect-avro-converter</artifactId>
+            <artifactId>kafka-connect-avro-data</artifactId>
             <version>${confluent.version}</version>
             <exclusions>
-                <!-- We're only using AvroData, which doesn't use Schema Registry -->
-                <exclusion>
-                    <groupId>io.confluent</groupId>
-                    <artifactId>kafka-schema-registry-client</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
@@ -205,45 +200,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>truezip-maven-plugin</artifactId>
-                <version>1.2</version>
-                <executions>
-                    <execution>
-                        <id>remove-avro-converter-plugin</id>
-                        <goals>
-                            <goal>remove</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <fileset>
-                                <directory>${project.basedir}/target/components/packages/confluentinc-kafka-connect-datagen-${project.version}/confluentinc-kafka-connect-datagen-${project.version}/lib/kafka-connect-avro-converter-${confluent.version}.jar</directory>
-                                <includes>
-                                    <include>io/confluent/connect/avro/AvroConverter.class</include>
-                                    <include>io/confluent/connect/avro/AvroConverter$*.class</include>
-                                </includes>
-                            </fileset>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>repackage-avro-converter-dependency</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <fileset>
-                                <directory>${project.basedir}/target/components/packages/confluentinc-kafka-connect-datagen-${project.version}</directory>
-                                <includes>
-                                    <include>confluentinc-kafka-connect-datagen-${project.version}/lib/kafka-connect-avro-converter-${confluent.version}.jar</include>
-                                </includes>
-                                <outputDirectory>${project.basedir}/target/components/packages/confluentinc-kafka-connect-datagen-${project.version}.zip</outputDirectory>
-                            </fileset>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -289,13 +245,6 @@
                                 <artifactId>licenses</artifactId>
                             </executableDependency>
                         </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>io.confluent</groupId>
-                                <artifactId>licenses</artifactId>
-                                <version>${licenses.version}</version>
-                            </dependency>
-                        </dependencies>
                     </plugin>
                     <plugin>
                         <artifactId>maven-clean-plugin</artifactId>
