From b8065e5a811358489684a2b7c2122bf56b6f7280 Mon Sep 17 00:00:00 2001
From: Stefan Angelov <cefothe@gmail.com>
Date: Tue, 5 Mar 2024 23:08:53 +0200
Subject: [PATCH] build: Include ksqldb-rocksdb-config-setter in docker image

---
 .../main/java/io/confluent/ksql/util/KsqlConfig.java   |  3 +--
 ksqldb-tools/pom.xml                                   |  6 ++++++
 pom.xml                                                | 10 ++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java b/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
index bc470a214e41..374628096afe 100644
--- a/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
+++ b/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
@@ -1796,8 +1796,7 @@ public Map<String, Object> addConfluentMetricsContextConfigsKafka(
       final Map<String,Object> props
   ) {
     final Map<String, Object> updatedProps = new HashMap<>(props);
-    final AppInfoParser.AppInfo appInfo = new AppInfoParser.AppInfo(System.currentTimeMillis(),
-            KsqlConstants.enableLoggingAppInfo);
+    final AppInfoParser.AppInfo appInfo = new AppInfoParser.AppInfo(System.currentTimeMillis());
     updatedProps.putAll(getConfigsForPrefix(REPORTER_CONFIGS_PREFIXES));
     updatedProps.put(MetricCollectors.RESOURCE_LABEL_VERSION, appInfo.getVersion());
     updatedProps.put(MetricCollectors.RESOURCE_LABEL_COMMIT_ID, appInfo.getCommitId());
diff --git a/ksqldb-tools/pom.xml b/ksqldb-tools/pom.xml
index 605fbd03e84a..bf3aec6dfe3c 100644
--- a/ksqldb-tools/pom.xml
+++ b/ksqldb-tools/pom.xml
@@ -62,6 +62,12 @@
             <artifactId>ksqldb-parser</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.confluent.ksql</groupId>
+            <artifactId>ksqldb-rocksdb-config-setter</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>io.confluent.ksql</groupId>
             <artifactId>ksqldb-api-client</artifactId>
diff --git a/pom.xml b/pom.xml
index f4d9cec34c04..8f53625ec13b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>common</artifactId>
-        <version>7.7.0-736</version>
+        <version>7.6.0</version>
     </parent>
 
     <groupId>io.confluent.ksql</groupId>
@@ -143,7 +143,7 @@
         <apache.io.version>2.11.0</apache.io.version>
         <io.confluent.ksql.version>7.7.0-0</io.confluent.ksql.version>
         <!-- We need to bump this version manually after each version bump on `master`: next bump should be 8.0.0-0 -->
-        <io.confluent.schema-registry.version>7.7.0-529</io.confluent.schema-registry.version>
+        <io.confluent.schema-registry.version>7.7.0-0</io.confluent.schema-registry.version>
         <netty-tcnative-version>2.0.61.Final</netty-tcnative-version>
         <!-- We normally get this from common, but Vertx is built against this -->
         <!-- Note: `netty` depends on `tcnative` and if we bump `netty`
@@ -284,6 +284,12 @@
                 <version>${io.confluent.ksql.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.confluent.ksql</groupId>
+                <artifactId>ksqldb-rocksdb-config-setter</artifactId>
+                <version>${io.confluent.ksql.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.confluent.ksql</groupId>
                 <artifactId>ksqldb-udf</artifactId>