[kafka] branch trunk updated: MINOR: add size check for tagged fields (#13100)

2023-02-21 Thread showuon
This is an automated email from the ASF dual-hosted git repository.

showuon pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 30d7d3b5ce4 MINOR: add size check for tagged fields (#13100)
30d7d3b5ce4 is described below

commit 30d7d3b5ce42ed7663a90193be47e30aab75537f
Author: Luke Chen 
AuthorDate: Wed Feb 22 11:52:21 2023 +0800

MINOR: add size check for tagged fields (#13100)

Add size check for taggedFields of a tag, and add tests.

Reviewers: Mickael Maison , Divij Vaidya 

---
 .../kafka/common/protocol/types/TaggedFields.java  |  5 +
 .../apache/kafka/common/protocol/types/Type.java   |  1 +
 .../protocol/types/ProtocolSerializationTest.java  | 22 ++
 3 files changed, 28 insertions(+)

diff --git 
a/clients/src/main/java/org/apache/kafka/common/protocol/types/TaggedFields.java
 
b/clients/src/main/java/org/apache/kafka/common/protocol/types/TaggedFields.java
index 26fb65830e6..901bf3f85aa 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/protocol/types/TaggedFields.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/protocol/types/TaggedFields.java
@@ -100,6 +100,11 @@ public class TaggedFields extends DocumentedType {
 }
 prevTag = tag;
 int size = ByteUtils.readUnsignedVarint(buffer);
+if (size < 0)
+throw new SchemaException("field size " + size + " cannot be 
negative");
+if (size > buffer.remaining())
+throw new SchemaException("Error reading field of size " + 
size + ", only " + buffer.remaining() + " bytes available");
+
 Field field = fields.get(tag);
 if (field == null) {
 byte[] bytes = new byte[size];
diff --git 
a/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java 
b/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java
index 4af74dbf4cc..bd4cb41c7e7 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java
@@ -39,6 +39,7 @@ public abstract class Type {
 
 /**
  * Read the typed object from the buffer
+ * Please remember to do size validation before creating the container 
(ex: array) for the following data
  *
  * @throws SchemaException If the object is not valid for its type
  */
diff --git 
a/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java
 
b/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java
index 811bcf4f88a..f96112dd806 100644
--- 
a/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java
+++ 
b/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java
@@ -220,6 +220,28 @@ public class ProtocolSerializationTest {
 }
 }
 
+@Test
+public void testReadTaggedFieldsSizeTooLarge() {
+int tag = 1;
+Type type = TaggedFields.of(tag, new Field("field", 
Type.NULLABLE_STRING));
+int size = 10;
+ByteBuffer buffer = ByteBuffer.allocate(size);
+int numTaggedFields = 1;
+// write the number of tagged fields
+ByteUtils.writeUnsignedVarint(numTaggedFields, buffer);
+// write the tag of the first tagged fields
+ByteUtils.writeUnsignedVarint(tag, buffer);
+// write the size of tagged fields for this tag, using a large number 
for testing
+ByteUtils.writeUnsignedVarint(Integer.MAX_VALUE, buffer);
+int expectedRemaining = buffer.remaining();
+buffer.rewind();
+
+// should throw SchemaException while reading the buffer, instead of 
OOM
+Throwable e = assertThrows(SchemaException.class, () -> 
type.read(buffer));
+assertEquals("Error reading field of size " + Integer.MAX_VALUE + ", 
only " + expectedRemaining + " bytes available",
+e.getMessage());
+}
+
 @Test
 public void testReadNegativeArraySize() {
 Type type = new ArrayOf(Type.INT8);



[kafka] branch trunk updated (0fc029c6a47 -> a2c9f421af4)

2023-02-21 Thread mjsax
This is an automated email from the ASF dual-hosted git repository.

mjsax pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


from 0fc029c6a47 KAFKA-14299: Fix pause and resume with state updater 
(#13025)
 add a2c9f421af4 KAFKA-14491: [10/N] Add changelogging wrapper for 
versioned stores (#13251)

No new revisions were added by this update.

Summary of changes:
 .../ChangeLoggingVersionedKeyValueBytesStore.java  |  75 +++
 ...angeLoggingVersionedKeyValueBytesStoreTest.java | 227 +
 2 files changed, 302 insertions(+)
 create mode 100644 
streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStore.java
 create mode 100644 
streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java



[kafka] branch trunk updated: KAFKA-14299: Fix pause and resume with state updater (#13025)

2023-02-21 Thread guozhang
This is an automated email from the ASF dual-hosted git repository.

guozhang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 0fc029c6a47 KAFKA-14299: Fix pause and resume with state updater 
(#13025)
0fc029c6a47 is described below

commit 0fc029c6a47a7a930a2b078569de1173cdb547a4
Author: Lucas Brutschy 
AuthorDate: Tue Feb 21 19:17:09 2023 +0100

KAFKA-14299: Fix pause and resume with state updater (#13025)

* Fixes required to make the PauseResumeIntegrationTest pass. It was not 
enabled and it does not pass for the state updater code path.

* Make sure no progress is made on paused topologies. The state updater 
restored one round of polls from the restore
consumer before realizing that a newly added task was already in paused 
state when being added.

* Wake up state updater when tasks are being resumed. If a task is resumed, 
it may be necessary to wake up the state updater from waiting on the 
tasksAndActions condition.

* Make sure that allTasks methods also return the tasks that are currently 
being restored.

* Enable PauseResumeIntegrationTest and upgrade it to JUnit5.

Reviewers: Bruno Cadonna , Guozhang Wang 

---
 .../org/apache/kafka/streams/KafkaStreams.java |   1 +
 .../processor/internals/DefaultStateUpdater.java   |  65 ++
 .../streams/processor/internals/ReadOnlyTask.java  |   2 +-
 .../streams/processor/internals/StateUpdater.java  |   5 ++
 .../streams/processor/internals/StreamThread.java  |   7 +-
 .../streams/processor/internals/TaskManager.java   |  35 +++-
 .../KafkaStreamsNamedTopologyWrapper.java  |   2 +
 .../integration/PauseResumeIntegrationTest.java| 100 -
 .../internals/DefaultStateUpdaterTest.java |   1 +
 .../processor/internals/ReadOnlyTaskTest.java  |   1 +
 .../processor/internals/StreamThreadTest.java  |   4 +-
 .../processor/internals/TaskManagerTest.java   |  32 +++
 12 files changed, 189 insertions(+), 66 deletions(-)

diff --git a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java 
b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java
index 03b778ab6ec..c05e4c6c1ac 100644
--- a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java
+++ b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java
@@ -1751,6 +1751,7 @@ public class KafkaStreams implements AutoCloseable {
 } else {
 topologyMetadata.resumeTopology(UNNAMED_TOPOLOGY);
 }
+threads.forEach(StreamThread::signalResume);
 }
 
 /**
diff --git 
a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java
 
b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java
index d96593c5011..ae6618c304f 100644
--- 
a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java
+++ 
b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java
@@ -116,6 +116,7 @@ public class DefaultStateUpdater implements StateUpdater {
 
 private void runOnce() throws InterruptedException {
 performActionsOnTasks();
+resumeTasks();
 restoreTasks();
 checkAllUpdatingTaskStates(time.milliseconds());
 waitIfAllChangelogsCompletelyRead();
@@ -140,6 +141,16 @@ public class DefaultStateUpdater implements StateUpdater {
 }
 }
 
+private void resumeTasks() {
+if (isTopologyResumed.compareAndSet(true, false)) {
+for (final Task task : pausedTasks.values()) {
+if (!topologyMetadata.isPaused(task.id().topologyName())) {
+resumeTask(task);
+}
+}
+}
+}
+
 private void restoreTasks() {
 try {
 changelogReader.restore(updatingTasks);
@@ -229,7 +240,7 @@ public class DefaultStateUpdater implements StateUpdater {
 if (isRunning.get() && changelogReader.allChangelogsCompleted()) {
 tasksAndActionsLock.lock();
 try {
-while (tasksAndActions.isEmpty()) {
+while (tasksAndActions.isEmpty() && 
!isTopologyResumed.get()) {
 tasksAndActionsCondition.await();
 }
 } finally {
@@ -258,21 +269,39 @@ public class DefaultStateUpdater implements StateUpdater {
 }
 
 private void addTask(final Task task) {
+final TaskId taskId = task.id();
+
+Task existingTask = pausedTasks.get(taskId);
+if (existingTask != null) {
+throw new IllegalStateException(
+(existingTask.isActive() ? "Active" : "Standby") + " task 
" + taskId 

[kafka] branch trunk updated (c39123d83d9 -> c9a42c85e2c)

2023-02-21 Thread jgus
This is an automated email from the ASF dual-hosted git repository.

jgus pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


from c39123d83d9 KAKFA-14733: Added a few missing checks for Kraft 
Authorizer and updated AclAuthorizerTest to run tests for both zk and kraft 
(#13282)
 add c9a42c85e2c KAFKA-14675: Extract metadata-related tasks from Fetcher 
into MetadataFetcher 1/4 (#13192)

No new revisions were added by this update.

Summary of changes:
 .../kafka/clients/consumer/KafkaConsumer.java  |   50 +-
 .../kafka/clients/consumer/internals/Fetcher.java  |  752 +-
 .../clients/consumer/internals/OffsetFetcher.java  |  717 ++
 .../consumer/internals/SubscriptionState.java  |2 +-
 .../consumer/internals/TopicMetadataFetcher.java   |  160 ++
 .../kafka/clients/consumer/KafkaConsumerTest.java  |   14 +-
 .../clients/consumer/internals/FetcherTest.java| 2544 
 .../consumer/internals/OffsetFetcherTest.java  | 1736 +
 .../internals/TopicMetadataFetcherTest.java|  259 ++
 9 files changed, 3363 insertions(+), 2871 deletions(-)
 create mode 100644 
clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java
 create mode 100644 
clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java
 create mode 100644 
clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java
 create mode 100644 
clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java



[kafka] branch 3.4 updated: KAKFA-14733: Added a few missing checks for Kraft Authorizer and updated AclAuthorizerTest to run tests for both zk and kraft (#13282)

2023-02-21 Thread manikumar
This is an automated email from the ASF dual-hosted git repository.

manikumar pushed a commit to branch 3.4
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.4 by this push:
 new b7a8fd7bfe6 KAKFA-14733: Added a few missing checks for Kraft 
Authorizer and updated AclAuthorizerTest to run tests for both zk and kraft 
(#13282)
b7a8fd7bfe6 is described below

commit b7a8fd7bfe6c1eaa6760cdb881b14475f25b80f7
Author: Purshotam Chauhan 
AuthorDate: Tue Feb 21 19:21:15 2023 +0530

KAKFA-14733: Added a few missing checks for Kraft Authorizer and updated 
AclAuthorizerTest to run tests for both zk and kraft (#13282)

Added the following checks -
* In StandardAuthorizerData.authorize() to fail if `patternType` other than 
`LITERAL` is passed.
* In AclControlManager.addAcl() to fail if Resource Name is null or empty.

Also, updated `AclAuthorizerTest` includes a lot of tests covering various 
scenarios that are missing in `StandardAuthorizerTest`. This PR changes the 
AclAuthorizerTest to run tests for both `zk` and `kraft` modes -
* Rename AclAuthorizerTest -> AuthorizerTest
* Parameterize relevant tests to run for both modes

Reviewers: Manikumar Reddy 
---
 ...clAuthorizerTest.scala => AuthorizerTest.scala} | 584 -
 .../apache/kafka/controller/AclControlManager.java |   3 +
 .../authorizer/StandardAuthorizerData.java |   3 +
 .../kafka/controller/MockAclControlManager.java|  50 ++
 .../kafka/metadata/authorizer/MockAclMutator.java  |  62 +++
 .../authorizer/StandardAuthorizerTest.java |   4 +-
 6 files changed, 459 insertions(+), 247 deletions(-)

diff --git 
a/core/src/test/scala/unit/kafka/security/authorizer/AclAuthorizerTest.scala 
b/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala
similarity index 61%
rename from 
core/src/test/scala/unit/kafka/security/authorizer/AclAuthorizerTest.scala
rename to 
core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala
index 9fde3cbadb2..c39b785e38a 100644
--- a/core/src/test/scala/unit/kafka/security/authorizer/AclAuthorizerTest.scala
+++ b/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala
@@ -19,9 +19,10 @@ package kafka.security.authorizer
 import kafka.Kafka
 import kafka.security.authorizer.AclEntry.{WildcardHost, 
WildcardPrincipalString}
 import kafka.server.{KafkaConfig, QuorumTestHarness}
-import kafka.utils.TestUtils
+import kafka.utils.{TestInfoUtils, TestUtils}
 import kafka.zk.ZkAclStore
 import kafka.zookeeper.{GetChildrenRequest, GetDataRequest, ZooKeeperClient}
+import org.apache.kafka.common.Endpoint
 import org.apache.kafka.common.acl.AclOperation._
 import org.apache.kafka.common.acl.AclPermissionType.{ALLOW, DENY}
 import org.apache.kafka.common.acl._
@@ -32,24 +33,34 @@ import 
org.apache.kafka.common.resource.Resource.CLUSTER_NAME
 import org.apache.kafka.common.resource.ResourcePattern.WILDCARD_RESOURCE
 import org.apache.kafka.common.resource.ResourceType._
 import org.apache.kafka.common.resource.{PatternType, ResourcePattern, 
ResourcePatternFilter, ResourceType}
-import org.apache.kafka.common.security.auth.KafkaPrincipal
+import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
 import org.apache.kafka.common.utils.{Time, SecurityUtils => JSecurityUtils}
+import 
org.apache.kafka.metadata.authorizer.StandardAuthorizerTest.AuthorizerTestServerInfo
+import org.apache.kafka.metadata.authorizer.{MockAclMutator, 
StandardAuthorizer}
 import org.apache.kafka.server.authorizer._
 import org.apache.kafka.server.common.MetadataVersion
 import org.apache.kafka.server.common.MetadataVersion.{IBP_2_0_IV0, 
IBP_2_0_IV1}
 import org.apache.zookeeper.client.ZKClientConfig
 import org.junit.jupiter.api.Assertions._
 import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo}
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 
 import java.net.InetAddress
 import java.nio.charset.StandardCharsets.UTF_8
 import java.nio.file.Files
+import java.util
 import java.util.concurrent.{Executors, Semaphore, TimeUnit}
-import java.util.{Collections, UUID}
+import java.util.{Collections, Properties, UUID}
 import scala.collection.mutable
 import scala.jdk.CollectionConverters._
 
-class AclAuthorizerTest extends QuorumTestHarness with BaseAuthorizerTest {
+class AuthorizerTest extends QuorumTestHarness with BaseAuthorizerTest {
+
+  private final val PLAINTEXT = new Endpoint("PLAINTEXT", 
SecurityProtocol.PLAINTEXT, "127.0.0.1", 9020)
+  private final val KRAFT = "kraft"
+  private final val ZK = "zk"
+
 
   private val allowReadAcl = new AccessControlEntry(WildcardPrincipalString, 
WildcardHost, READ, ALLOW)
   private val allowWriteAcl = new AccessControlEntry(WildcardPrincipalString, 
WildcardHost, WRITE, ALLOW)
@@ -60,66 +71,84 @@ class AclAuthorizerTest extends 

[kafka] branch trunk updated: KAKFA-14733: Added a few missing checks for Kraft Authorizer and updated AclAuthorizerTest to run tests for both zk and kraft (#13282)

2023-02-21 Thread manikumar
This is an automated email from the ASF dual-hosted git repository.

manikumar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
 new c39123d83d9 KAKFA-14733: Added a few missing checks for Kraft 
Authorizer and updated AclAuthorizerTest to run tests for both zk and kraft 
(#13282)
c39123d83d9 is described below

commit c39123d83d996edfdc23cdd50be8e51853b6cf1d
Author: Purshotam Chauhan 
AuthorDate: Tue Feb 21 19:21:15 2023 +0530

KAKFA-14733: Added a few missing checks for Kraft Authorizer and updated 
AclAuthorizerTest to run tests for both zk and kraft (#13282)

Added the following checks -
* In StandardAuthorizerData.authorize() to fail if `patternType` other than 
`LITERAL` is passed.
* In AclControlManager.addAcl() to fail if Resource Name is null or empty.

Also, updated `AclAuthorizerTest` includes a lot of tests covering various 
scenarios that are missing in `StandardAuthorizerTest`. This PR changes the 
AclAuthorizerTest to run tests for both `zk` and `kraft` modes -
* Rename AclAuthorizerTest -> AuthorizerTest
* Parameterize relevant tests to run for both modes

Reviewers: Manikumar Reddy 
---
 ...clAuthorizerTest.scala => AuthorizerTest.scala} | 584 -
 .../apache/kafka/controller/AclControlManager.java |   3 +
 .../authorizer/StandardAuthorizerData.java |   3 +
 .../kafka/controller/MockAclControlManager.java|  50 ++
 .../kafka/metadata/authorizer/MockAclMutator.java  |  62 +++
 .../authorizer/StandardAuthorizerTest.java |   4 +-
 6 files changed, 459 insertions(+), 247 deletions(-)

diff --git 
a/core/src/test/scala/unit/kafka/security/authorizer/AclAuthorizerTest.scala 
b/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala
similarity index 61%
rename from 
core/src/test/scala/unit/kafka/security/authorizer/AclAuthorizerTest.scala
rename to 
core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala
index 9fde3cbadb2..c39b785e38a 100644
--- a/core/src/test/scala/unit/kafka/security/authorizer/AclAuthorizerTest.scala
+++ b/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala
@@ -19,9 +19,10 @@ package kafka.security.authorizer
 import kafka.Kafka
 import kafka.security.authorizer.AclEntry.{WildcardHost, 
WildcardPrincipalString}
 import kafka.server.{KafkaConfig, QuorumTestHarness}
-import kafka.utils.TestUtils
+import kafka.utils.{TestInfoUtils, TestUtils}
 import kafka.zk.ZkAclStore
 import kafka.zookeeper.{GetChildrenRequest, GetDataRequest, ZooKeeperClient}
+import org.apache.kafka.common.Endpoint
 import org.apache.kafka.common.acl.AclOperation._
 import org.apache.kafka.common.acl.AclPermissionType.{ALLOW, DENY}
 import org.apache.kafka.common.acl._
@@ -32,24 +33,34 @@ import 
org.apache.kafka.common.resource.Resource.CLUSTER_NAME
 import org.apache.kafka.common.resource.ResourcePattern.WILDCARD_RESOURCE
 import org.apache.kafka.common.resource.ResourceType._
 import org.apache.kafka.common.resource.{PatternType, ResourcePattern, 
ResourcePatternFilter, ResourceType}
-import org.apache.kafka.common.security.auth.KafkaPrincipal
+import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
 import org.apache.kafka.common.utils.{Time, SecurityUtils => JSecurityUtils}
+import 
org.apache.kafka.metadata.authorizer.StandardAuthorizerTest.AuthorizerTestServerInfo
+import org.apache.kafka.metadata.authorizer.{MockAclMutator, 
StandardAuthorizer}
 import org.apache.kafka.server.authorizer._
 import org.apache.kafka.server.common.MetadataVersion
 import org.apache.kafka.server.common.MetadataVersion.{IBP_2_0_IV0, 
IBP_2_0_IV1}
 import org.apache.zookeeper.client.ZKClientConfig
 import org.junit.jupiter.api.Assertions._
 import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo}
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 
 import java.net.InetAddress
 import java.nio.charset.StandardCharsets.UTF_8
 import java.nio.file.Files
+import java.util
 import java.util.concurrent.{Executors, Semaphore, TimeUnit}
-import java.util.{Collections, UUID}
+import java.util.{Collections, Properties, UUID}
 import scala.collection.mutable
 import scala.jdk.CollectionConverters._
 
-class AclAuthorizerTest extends QuorumTestHarness with BaseAuthorizerTest {
+class AuthorizerTest extends QuorumTestHarness with BaseAuthorizerTest {
+
+  private final val PLAINTEXT = new Endpoint("PLAINTEXT", 
SecurityProtocol.PLAINTEXT, "127.0.0.1", 9020)
+  private final val KRAFT = "kraft"
+  private final val ZK = "zk"
+
 
   private val allowReadAcl = new AccessControlEntry(WildcardPrincipalString, 
WildcardHost, READ, ALLOW)
   private val allowWriteAcl = new AccessControlEntry(WildcardPrincipalString, 
WildcardHost, WRITE, ALLOW)
@@ -60,66 +71,84 @@ class AclAuthorizerTest extends 

[kafka] branch 3.0 updated: KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

2023-02-21 Thread rndgstn
This is an automated email from the ASF dual-hosted git repository.

rndgstn pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.0 by this push:
 new 4799482efe5 KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)
4799482efe5 is described below

commit 4799482efe5a103991ef22a2ca42d8b3fa14129d
Author: Ron Dagostino 
AuthorDate: Tue Feb 21 08:37:48 2023 -0500

KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

Reviewers: Colin Patrick McCabe 
---
 LICENSE-binary | 4 ++--
 gradle/dependencies.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 34c456ed0b9..cc5ef2e5d76 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -254,8 +254,8 @@ scala-logging_2.13-3.9.3
 scala-reflect-2.13.6
 scala-java8-compat_2.13-1.0.0
 snappy-java-1.1.8.1
-zookeeper-3.6.3
-zookeeper-jute-3.6.3
+zookeeper-3.6.4
+zookeeper-jute-3.6.4
 
 ===
 This product bundles various third-party components under other open source
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 9d262702159..e7fcc7781e2 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -113,7 +113,7 @@ versions += [
   snappy: "1.1.8.1",
   spotbugs: "4.2.2",
   zinc: "1.3.5",
-  zookeeper: "3.6.3",
+  zookeeper: "3.6.4",
   zstd: "1.5.0-2"
 ]
 libs += [



[kafka] branch 3.1 updated: KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

2023-02-21 Thread rndgstn
This is an automated email from the ASF dual-hosted git repository.

rndgstn pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.1 by this push:
 new 609b5364d52 KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)
609b5364d52 is described below

commit 609b5364d525c9490f4ab493112fdeda7639d058
Author: Ron Dagostino 
AuthorDate: Tue Feb 21 08:37:48 2023 -0500

KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

Reviewers: Colin Patrick McCabe 
---
 LICENSE-binary | 4 ++--
 gradle/dependencies.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index a92e0b5128c..e9cc4892fe5 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -255,8 +255,8 @@ scala-logging_2.13-3.9.3
 scala-reflect-2.13.6
 scala-java8-compat_2.13-1.0.0
 snappy-java-1.1.8.4
-zookeeper-3.6.3
-zookeeper-jute-3.6.3
+zookeeper-3.6.4
+zookeeper-jute-3.6.4
 
 ===
 This product bundles various third-party components under other open source
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index c92843b4b6f..d57ac51ccb3 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -116,7 +116,7 @@ versions += [
   snappy: "1.1.8.4",
   spotbugs: "4.2.2",
   zinc: "1.3.5",
-  zookeeper: "3.6.3",
+  zookeeper: "3.6.4",
   zstd: "1.5.0-4"
 ]
 libs += [



[kafka] branch 3.2 updated: KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

2023-02-21 Thread rndgstn
This is an automated email from the ASF dual-hosted git repository.

rndgstn pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.2 by this push:
 new 609e34835c6 KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)
609e34835c6 is described below

commit 609e34835c6361bfffd80cba4e6b132f41af2374
Author: Ron Dagostino 
AuthorDate: Tue Feb 21 08:37:48 2023 -0500

KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

Reviewers: Colin Patrick McCabe 
---
 LICENSE-binary | 4 ++--
 gradle/dependencies.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index ed3e0f2ac7d..7331fc840ee 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -256,8 +256,8 @@ scala-logging_2.13-3.9.4
 scala-reflect-2.13.8
 scala-java8-compat_2.13-1.0.2
 snappy-java-1.1.8.4
-zookeeper-3.6.3
-zookeeper-jute-3.6.3
+zookeeper-3.6.4
+zookeeper-jute-3.6.4
 
 ===
 This product bundles various third-party components under other open source
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 0465b3d73c4..01ab5ceb032 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -117,7 +117,7 @@ versions += [
   snappy: "1.1.8.4",
   spotbugs: "4.2.2",
   zinc: "1.3.5",
-  zookeeper: "3.6.3",
+  zookeeper: "3.6.4",
   zstd: "1.5.2-1"
 ]
 libs += [



[kafka] branch 3.3 updated: KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

2023-02-21 Thread rndgstn
This is an automated email from the ASF dual-hosted git repository.

rndgstn pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.3 by this push:
 new cec628a2e70 KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)
cec628a2e70 is described below

commit cec628a2e70a1c4233d78db8934b39fbef83ec32
Author: Ron Dagostino 
AuthorDate: Tue Feb 21 08:37:48 2023 -0500

KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

Reviewers: Colin Patrick McCabe 
---
 LICENSE-binary | 4 ++--
 gradle/dependencies.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index a3f860e62b7..33b6c1b9c4a 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -263,8 +263,8 @@ swagger-core-2.2.0
 swagger-integration-2.2.0
 swagger-jaxrs2-2.2.0
 swagger-models-2.2.0
-zookeeper-3.6.3
-zookeeper-jute-3.6.3
+zookeeper-3.6.4
+zookeeper-jute-3.6.4
 
 ===
 This product bundles various third-party components under other open source
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 64a83050762..cc33837bffe 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -120,7 +120,7 @@ versions += [
   swaggerAnnotations: "2.2.0",
   swaggerJaxrs2: "2.2.0",
   zinc: "1.3.5",
-  zookeeper: "3.6.3",
+  zookeeper: "3.6.4",
   zstd: "1.5.2-1"
 ]
 libs += [



[kafka] branch 3.4 updated: KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

2023-02-21 Thread rndgstn
This is an automated email from the ASF dual-hosted git repository.

rndgstn pushed a commit to branch 3.4
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.4 by this push:
 new 70483048806 KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)
70483048806 is described below

commit 704830488066f1905d529d583ed0212432986048
Author: Ron Dagostino 
AuthorDate: Tue Feb 21 08:37:48 2023 -0500

KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

Reviewers: Colin Patrick McCabe 
---
 LICENSE-binary | 4 ++--
 gradle/dependencies.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index dbb1941cb04..842962e61ad 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -263,8 +263,8 @@ swagger-core-2.2.0
 swagger-integration-2.2.0
 swagger-jaxrs2-2.2.0
 swagger-models-2.2.0
-zookeeper-3.6.3
-zookeeper-jute-3.6.3
+zookeeper-3.6.4
+zookeeper-jute-3.6.4
 
 ===
 This product bundles various third-party components under other open source
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index b04efe44e35..4254658ff73 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -125,7 +125,7 @@ versions += [
   swaggerAnnotations: "2.2.0",
   swaggerJaxrs2: "2.2.0",
   zinc: "1.7.2",
-  zookeeper: "3.6.3",
+  zookeeper: "3.6.4",
   zstd: "1.5.2-1"
 ]
 libs += [



[kafka] branch trunk updated: KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

2023-02-21 Thread rndgstn
This is an automated email from the ASF dual-hosted git repository.

rndgstn pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
 new cbd46160e9f KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)
cbd46160e9f is described below

commit cbd46160e9f1a9327484ac2b9a5cf1c4f286bad9
Author: Ron Dagostino 
AuthorDate: Tue Feb 21 08:37:48 2023 -0500

KAFKA-14731: Upgrade ZooKeeper to 3.6.4 (#13273)

Reviewers: Colin Patrick McCabe 
---
 LICENSE-binary | 4 ++--
 gradle/dependencies.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index dbb1941cb04..842962e61ad 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -263,8 +263,8 @@ swagger-core-2.2.0
 swagger-integration-2.2.0
 swagger-jaxrs2-2.2.0
 swagger-models-2.2.0
-zookeeper-3.6.3
-zookeeper-jute-3.6.3
+zookeeper-3.6.4
+zookeeper-jute-3.6.4
 
 ===
 This product bundles various third-party components under other open source
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 7e63b32f33a..ee7ef88e334 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -125,7 +125,7 @@ versions += [
   swaggerAnnotations: "2.2.0",
   swaggerJaxrs2: "2.2.0",
   zinc: "1.7.2",
-  zookeeper: "3.6.3",
+  zookeeper: "3.6.4",
   zstd: "1.5.2-1"
 ]
 libs += [