Merge branch 'master' into kcache-4.6.0

rayokota · Aug 1, 2022 · 8186b66 · 8186b66
2 parents a6d0bf8 + 78c2c1c
commit 8186b66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/kareldb-server/src/main/java/io/kareldb/server/leader/KarelDbCoordinator.java b/kareldb-server/src/main/java/io/kareldb/server/leader/KarelDbCoordinator.java
@@ -208,7 +208,7 @@ protected Map<String, ByteBuffer> onLeaderElected(
     }
 
     @Override
-    protected boolean onJoinPrepare(int generation, String memberId) {
+    protected boolean onJoinPrepare(Timer timer, int generation, String memberId) {
         LOG.debug("Revoking previous assignment {}", assignmentSnapshot);
         if (assignmentSnapshot != null) {
             listener.onRevoked();

diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@ limitations under the License.
         <jetty.version>9.4.42.v20210604</jetty.version>
         <junit.version>4.12</junit.version>
         <kafka.scala.version>2.13</kafka.scala.version>
-        <kafka.version>3.2.0</kafka.version>
+        <kafka.version>3.2.1</kafka.version>
         <kcache.version>4.0.6</kcache.version>
         <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
         <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>