Merge branch 'master' into 1.1-release

README.md

@@ -35,10 +35,10 @@ Maintainers will also be in charge of both versioning and publishing future rele
 The Humio HEC connector uses maven to build and test itself.  The version of Kafka to build for is indicated in the `pom.xml` file by the line:
 
 ```
-<kafka.version>2.2.0</kafka.version>
+<kafka.version>3.1.1</kafka.version>
 ```
 
-Out of the box, Kafka 2.2.0 is supported.  This can (and should) be changed to match your current Kafka or Confluent Platform version; to check which version this is, refer to the [Confluent Platform Versions](https://docs.confluent.io/current/installation/versions-interoperability.html) page.
+Out of the box, Kafka 3.1.1 is supported.  This can (and should) be changed to match your current Kafka or Confluent Platform version; to check which version this is, refer to the [Confluent Platform Versions](https://docs.confluent.io/current/installation/versions-interoperability.html) page.
 
 Scripts are provided to automatically build and package the connector jar.  `bin/compile.sh` automatically compiles and packages the connector, with the resulting "uber jar" located at `target/kafka-connect-hec-sink-1.0-SNAPSHOT-jar-with-dependencies.jar`.  Alternatively, you can run:
 

pom.xml

@@ -4,14 +4,14 @@
 
     <groupId>com.humio.kafka.connect.hec</groupId>
     <artifactId>kafka-connect-hec-sink</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <packaging>jar</packaging>
 
     <name>kafka-connect-hec-sink</name>
     <description>A Kafka Connect sink for HEC</description>
 
     <properties>
-        <kafka.version>2.2.0</kafka.version>
+        <kafka.version>3.1.1</kafka.version>
         <metrics.version>4.2.4</metrics.version>
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <junit.vintage.version>5.8.2</junit.vintage.version>
@@ -28,7 +28,7 @@
         <nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
         <mvn.failsafe.plugin.version>2.22.1</mvn.failsafe.plugin.version>
         <jackson.version>2.13.0</jackson.version>
-        <confluent.interceptors.version>5.2.1</confluent.interceptors.version>
+        <confluent.interceptors.version>7.2.1</confluent.interceptors.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -194,6 +194,16 @@
             <version>${avro.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
     </dependencies>
 
     <build>

src/test/resources/docker/docker-compose.yml

@@ -55,7 +55,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:12181'
 
   kafkaconnect:
-    image: confluentinc/cp-kafka-connect:5.2.0
+    image: confluentinc/cp-kafka-connect:5.4.9
     hostname: kafkaconnect
     depends_on:
       - zookeeper
@@ -64,7 +64,7 @@ services:
     ports:
       - "18083:18083"
     volumes:
-      - ../../../../target/kafka-connect-hec-sink-1.1.4-jar-with-dependencies.jar:/etc/kafka-connect/jars/kafka-connect-hec-sink/kafka-connect-hec-sink-1.0-SNAPSHOT-jar-with-dependencies.jar
+      - ../../../../target/kafka-connect-hec-sink-1.1.5-jar-with-dependencies.jar:/etc/kafka-connect/jars/kafka-connect-hec-sink/kafka-connect-hec-sink-1.0-SNAPSHOT-jar-with-dependencies.jar
     environment:
       CONNECT_BOOTSTRAP_SERVERS: 'kafkabroker:19092'
       CONNECT_REST_ADVERTISED_HOST_NAME: kafkaconnect