Prep for release of 3.2.4 (#64)

* add helpful script * Prep for release * bump release version * fix license check include list * bump minor release versions in docs to most recent * update pom
salesforce · Mar 2, 2022 · 05f269a · 05f269a
1 parent c23fa87
commit 05f269a
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 45 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,15 +54,15 @@ jobs:
             kafka_scala_version: kafka_2.12
             exclude_kafka_tests: 0_11_0_x
 
-          - kafka_version: 2.6.2
+          - kafka_version: 2.6.3
             kafka_scala_version: kafka_2.12
             exclude_kafka_tests: 0_11_0_x
 
-          - kafka_version: 2.7.1
+          - kafka_version: 2.7.2
             kafka_scala_version: kafka_2.12
             exclude_kafka_tests: 0_11_0_x
 
-          - kafka_version: 2.8.0
+          - kafka_version: 2.8.1
             kafka_scala_version: kafka_2.12
             exclude_kafka_tests: 0_11_0_x
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.2.4 (03/01/2022)
+### Bugfixes
+- [ISSUE-49](https://github.com/salesforce/kafka-junit/issues/49) [PR-63](https://github.com/salesforce/kafka-junit/pull/63) Zookeeper AdminServer will no longer be started.  This allows for more easily running tests in parallel.  Thanks [@gquintana](https://github.com/gquintana) for the contribution!
+
+### Internal dependency updates
+- JUnit4 from 4.13 to 4.13.2
+- JUnit5 from 5.7.2 to 5.8.2
+
 ## 3.2.3 (07/27/2021)
 ### Features
 - Officially added support for Kafka versions 2.7.x, and 2.8.x

diff --git a/kafka-junit-core/pom.xml b/kafka-junit-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>kafka-junit</artifactId>
         <groupId>com.salesforce.kafka.test</groupId>
-        <version>3.2.3</version>
+        <version>3.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kafka-junit-core</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.4</version>
 
     <!-- defined properties -->
     <properties>

diff --git a/kafka-junit4/README.md b/kafka-junit4/README.md
@@ -32,13 +32,13 @@ Include this library in your project's POM with test scope.  **You'll also need
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka_2.12</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka-clients</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -61,13 +61,13 @@ Include this library in your project's POM with test scope.  **You'll also need
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka_2.12</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka-clients</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -90,13 +90,13 @@ Include this library in your project's POM with test scope.  **You'll also need
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka_2.12</artifactId>
-    <version>2.6.2</version>
+    <version>2.6.3</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka-clients</artifactId>
-    <version>2.6.2</version>
+    <version>2.6.3</version>
     <scope>test</scope>
 </dependency>
 ```

diff --git a/kafka-junit4/pom.xml b/kafka-junit4/pom.xml
@@ -32,13 +32,13 @@
     <parent>
         <artifactId>kafka-junit</artifactId>
         <groupId>com.salesforce.kafka.test</groupId>
-        <version>3.2.3</version>
+        <version>3.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Module Definition & Version -->
     <artifactId>kafka-junit4</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.4</version>
 
     <!-- defined properties -->
     <properties>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.salesforce.kafka.test</groupId>
             <artifactId>kafka-junit-core</artifactId>
-            <version>3.2.3</version>
+            <version>3.2.4</version>
         </dependency>
 
         <!-- JUnit is Required -->

diff --git a/kafka-junit5/README.md b/kafka-junit5/README.md
@@ -32,13 +32,13 @@ Include this library in your project's POM with test scope.  **You'll also need
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka_2.12</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka-clients</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -60,13 +60,13 @@ Include this library in your project's POM with test scope.  **You'll also need
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka_2.12</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka-clients</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -89,13 +89,13 @@ Include this library in your project's POM with test scope.  **You'll also need
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka_2.12</artifactId>
-    <version>2.6.2</version>
+    <version>2.6.3</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka-clients</artifactId>
-    <version>2.6.2</version>
+    <version>2.6.3</version>
     <scope>test</scope>
 </dependency>
 ```

diff --git a/kafka-junit5/pom.xml b/kafka-junit5/pom.xml
@@ -31,12 +31,12 @@
     <parent>
         <artifactId>kafka-junit</artifactId>
         <groupId>com.salesforce.kafka.test</groupId>
-        <version>3.2.3</version>
+        <version>3.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kafka-junit5</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.4</version>
 
     <!-- defined properties -->
     <properties>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.salesforce.kafka.test</groupId>
             <artifactId>kafka-junit-core</artifactId>
-            <version>3.2.3</version>
+            <version>3.2.4</version>
         </dependency>
 
         <!-- JUnit is Required -->

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>com.salesforce.kafka.test</groupId>
     <artifactId>kafka-junit</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.4</version>
 
     <!-- Submodules -->
     <modules>
@@ -60,12 +60,7 @@
     <developers>
         <developer>
             <name>Stephen Powis</name>
-            <email>spowis@salesforce.com</email>
-            <organization>Salesforce</organization>
-        </developer>
-        <developer>
-            <name>Stan Lemon</name>
-            <email>slemon@salesforce.com</email>
+            <email>stephen.powis@gmail.com</email>
             <organization>Salesforce</organization>
         </developer>
     </developers>
@@ -87,18 +82,18 @@
         <maven.compiler.source>1.8</maven.compiler.source>
 
         <!-- Define which kafka version -->
-        <kafkaVersion>2.8.0</kafkaVersion>
+        <kafkaVersion>2.8.1</kafkaVersion>
         <kafkaScalaVersion>kafka_2.12</kafkaScalaVersion>
 
         <!-- Define which Curator Test version -->
         <curatorTestVersion>2.12.0</curatorTestVersion>
 
         <!-- For logging in tests -->
-        <slf4jVersion>1.7.30</slf4jVersion>
+        <slf4jVersion>1.7.36</slf4jVersion>
 
         <!-- JUnit versions -->
-        <junit4.version>4.13</junit4.version>
-        <junit5.version>5.7.2</junit5.version>
+        <junit4.version>4.13.2</junit4.version>
+        <junit5.version>5.8.2</junit5.version>
         <junit5PlatformProvider.version>1.3.2</junit5PlatformProvider.version>
 
         <!-- test toggling -->
@@ -207,17 +202,9 @@
                 <version>3.0</version>
                 <configuration>
                     <header>LICENSE.txt</header>
-                    <excludes>
-                        <exclude>**/.md</exclude>
-                        <exclude>**/.bak</exclude>
-                        <exclude>**.yml</exclude>
-                        <exclude>.github/**</exclude>
-                        <exclude>**.yaml</exclude>
-                        <exclude>**.xml</exclude>
-                        <exclude>**.versionsBackup</exclude>
-                        <exclude>script/**</exclude>
-                        <exclude>**/resources/**</exclude>
-                    </excludes>
+                    <includes>
+                        <include>**/.java</include>
+                    </includes>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/script/runTests.sh b/script/runTests.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+## Adjust values to suite requirements.
+export KAFKA_VERSION=2.8.1
+export KAFKA_SCALA_VERSION=kafka_2.12
+export EXCLUDE_KAFKA_TESTS=0_11_0_x
+
+mvn clean test -B -DkafkaVersion=$KAFKA_VERSION -DkafkaScalaVersion=$KAFKA_SCALA_VERSION -Dtests.excluded=$EXCLUDE_KAFKA_TESTS -DskipCheckStyle=true -Djava.security.auth.login.config=${PWD}/kafka-junit-core/src/test/resources/jaas.conf