Merge branch '7.5.x' into pr_merge_from_7_5_0_post_to_7_5_x

confluentinc · Sep 18, 2023 · a2ccb80 · a2ccb80
2 parents 9514bf4 + 42d5efa
commit a2ccb80
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 34 deletions.
diff --git a/cp-all-in-one-cloud/Dockerfile-connect b/cp-all-in-one-cloud/Dockerfile-connect
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM confluentinc/cp-server-connect-base:7.5.0
+FROM confluentinc/cp-server-connect-base:7.5.1-0
 
 ENV CONNECT_PLUGIN_PATH="/usr/share/java,/usr/share/confluent-hub-components"
 

diff --git a/cp-all-in-one-cloud/docker-compose.yml b/cp-all-in-one-cloud/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
 
   schema-registry:
-    image: confluentinc/cp-schema-registry:7.5.0
+    image: confluentinc/cp-schema-registry:7.5.x-latest
     hostname: schema-registry
     container_name: schema-registry
     ports:
@@ -17,7 +17,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_SASL_MECHANISM: "PLAIN"
 
   ksqldb-server:
-    image: confluentinc/cp-ksqldb-server:7.5.0
+    image: confluentinc/cp-ksqldb-server:7.5.x-latest
     hostname: ksqldb-server
     container_name: ksqldb-server
     ports:
@@ -59,13 +59,13 @@ services:
       KSQL_KSQL_CONNECT_URL: "http://connect:8083"
 
   ksqldb-cli:
-    image: confluentinc/cp-ksqldb-cli:7.5.0
+    image: confluentinc/cp-ksqldb-cli:7.5.x-latest
     container_name: ksqldb-cli
     entrypoint: /bin/sh
     tty: true
 
   control-center:
-    image: confluentinc/cp-enterprise-control-center:7.5.0
+    image: confluentinc/cp-enterprise-control-center:7.5.x-latest
     hostname: control-center
     container_name: control-center
     ports:
@@ -121,7 +121,7 @@ services:
       CONNECT_LOG4J_ROOT_LOGLEVEL: INFO
       CONNECT_LOG4J_LOGGERS: org.reflections=ERROR
       # CLASSPATH required due to CC-2422
-      CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.5.0.jar
+      CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.5.1-0.jar
       # Connect worker
       CONNECT_SECURITY_PROTOCOL: SASL_SSL
       CONNECT_SASL_JAAS_CONFIG: $SASL_JAAS_CONFIG
@@ -144,7 +144,7 @@ services:
       CONNECT_CONSUMER_CONFLUENT_MONITORING_INTERCEPTOR_SASL_MECHANISM: PLAIN
 
   rest-proxy:
-    image: confluentinc/cp-kafka-rest:7.5.0
+    image: confluentinc/cp-kafka-rest:7.5.x-latest
     ports:
       - 8082:8082
     hostname: rest-proxy

diff --git a/cp-all-in-one-community/docker-compose.yml b/cp-all-in-one-community/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '2'
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:7.5.0
+    image: confluentinc/cp-zookeeper:7.5.x-latest
     hostname: zookeeper
     container_name: zookeeper
     ports:
@@ -12,7 +12,7 @@ services:
       ZOOKEEPER_TICK_TIME: 2000
 
   broker:
-    image: confluentinc/cp-kafka:7.5.0
+    image: confluentinc/cp-kafka:7.5.x-latest
     hostname: broker
     container_name: broker
     depends_on:
@@ -34,7 +34,7 @@ services:
       KAFKA_JMX_HOSTNAME: localhost
 
   schema-registry:
-    image: confluentinc/cp-schema-registry:7.5.0
+    image: confluentinc/cp-schema-registry:7.5.x-latest
     hostname: schema-registry
     container_name: schema-registry
     depends_on:
@@ -73,7 +73,7 @@ services:
       CONNECT_LOG4J_LOGGERS: org.apache.zookeeper=ERROR,org.I0Itec.zkclient=ERROR,org.reflections=ERROR
 
   ksqldb-server:
-    image: confluentinc/cp-ksqldb-server:7.5.0
+    image: confluentinc/cp-ksqldb-server:7.5.x-latest
     hostname: ksqldb-server
     container_name: ksqldb-server
     depends_on:
@@ -94,7 +94,7 @@ services:
       KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: 'true'
 
   ksqldb-cli:
-    image: confluentinc/cp-ksqldb-cli:7.5.0
+    image: confluentinc/cp-ksqldb-cli:7.5.x-latest
     container_name: ksqldb-cli
     depends_on:
       - broker
@@ -104,7 +104,7 @@ services:
     tty: true
 
   ksql-datagen:
-    image: confluentinc/ksqldb-examples:7.5.0
+    image: confluentinc/ksqldb-examples:7.5.x-latest
     hostname: ksql-datagen
     container_name: ksql-datagen
     depends_on:
@@ -126,7 +126,7 @@ services:
       STREAMS_SCHEMA_REGISTRY_PORT: 8081
 
   rest-proxy:
-    image: confluentinc/cp-kafka-rest:7.5.0
+    image: confluentinc/cp-kafka-rest:7.5.x-latest
     depends_on:
       - broker
       - schema-registry

diff --git a/cp-all-in-one-kraft/docker-compose.yml b/cp-all-in-one-kraft/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
 
   broker:
-    image: confluentinc/cp-kafka:7.5.0
+    image: confluentinc/cp-kafka:7.5.x-latest
     hostname: broker
     container_name: broker
     ports:
@@ -30,7 +30,7 @@ services:
       CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
 
   schema-registry:
-    image: confluentinc/cp-schema-registry:7.5.0
+    image: confluentinc/cp-schema-registry:7.5.x-latest
     hostname: schema-registry
     container_name: schema-registry
     depends_on:
@@ -66,14 +66,14 @@ services:
       CONNECT_VALUE_CONVERTER: io.confluent.connect.avro.AvroConverter
       CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schema-registry:8081
       # CLASSPATH required due to CC-2422
-      CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.5.0.jar
+      CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.5.1-0.jar
       CONNECT_PRODUCER_INTERCEPTOR_CLASSES: "io.confluent.monitoring.clients.interceptor.MonitoringProducerInterceptor"
       CONNECT_CONSUMER_INTERCEPTOR_CLASSES: "io.confluent.monitoring.clients.interceptor.MonitoringConsumerInterceptor"
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
       CONNECT_LOG4J_LOGGERS: org.apache.zookeeper=ERROR,org.I0Itec.zkclient=ERROR,org.reflections=ERROR
 
   control-center:
-    image: confluentinc/cp-enterprise-control-center:7.5.0
+    image: confluentinc/cp-enterprise-control-center:7.5.x-latest
     hostname: control-center
     container_name: control-center
     depends_on:
@@ -97,7 +97,7 @@ services:
       PORT: 9021
 
   ksqldb-server:
-    image: confluentinc/cp-ksqldb-server:7.5.0
+    image: confluentinc/cp-ksqldb-server:7.5.x-latest
     hostname: ksqldb-server
     container_name: ksqldb-server
     depends_on:
@@ -120,7 +120,7 @@ services:
       KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: 'true'
 
   ksqldb-cli:
-    image: confluentinc/cp-ksqldb-cli:7.5.0
+    image: confluentinc/cp-ksqldb-cli:7.5.x-latest
     container_name: ksqldb-cli
     depends_on:
       - broker
@@ -130,7 +130,7 @@ services:
     tty: true
 
   ksql-datagen:
-    image: confluentinc/ksqldb-examples:7.5.0
+    image: confluentinc/ksqldb-examples:7.5.x-latest
     hostname: ksql-datagen
     container_name: ksql-datagen
     depends_on:
@@ -152,7 +152,7 @@ services:
       STREAMS_SCHEMA_REGISTRY_PORT: 8081
 
   rest-proxy:
-    image: confluentinc/cp-kafka-rest:7.5.0
+    image: confluentinc/cp-kafka-rest:7.5.x-latest
     depends_on:
       - broker
       - schema-registry

diff --git a/cp-all-in-one-security/README.md b/cp-all-in-one-security/README.md
@@ -4,4 +4,4 @@
 
 Securing your Apache Kafka cluster can involve various security features.
 For an example that shows security features in action, see [cp-demo](https://docs.confluent.io/platform/current/tutorials/cp-demo/docs/index.html?utm_source=github&utm_medium=demo&utm_campaign=ch.examples_type.community_content.cp-all-in-one).
-Refer to cp-demo's [docker-compose.yml](https://github.com/confluentinc/cp-demo/blob/7.5.0-post/docker-compose.yml) for a configuration reference.
+Refer to cp-demo's [docker-compose.yml](https://github.com/confluentinc/cp-demo/blob/7.5.x/docker-compose.yml) for a configuration reference.
diff --git a/cp-all-in-one/docker-compose.yml b/cp-all-in-one/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '2'
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:7.5.0
+    image: confluentinc/cp-zookeeper:7.5.x-latest
     hostname: zookeeper
     container_name: zookeeper
     ports:
@@ -12,7 +12,7 @@ services:
       ZOOKEEPER_TICK_TIME: 2000
 
   broker:
-    image: confluentinc/cp-server:7.5.0
+    image: confluentinc/cp-server:7.5.x-latest
     hostname: broker
     container_name: broker
     depends_on:
@@ -41,7 +41,7 @@ services:
       CONFLUENT_SUPPORT_CUSTOMER_ID: 'anonymous'
 
   schema-registry:
-    image: confluentinc/cp-schema-registry:7.5.0
+    image: confluentinc/cp-schema-registry:7.5.x-latest
     hostname: schema-registry
     container_name: schema-registry
     depends_on:
@@ -77,14 +77,14 @@ services:
       CONNECT_VALUE_CONVERTER: io.confluent.connect.avro.AvroConverter
       CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schema-registry:8081
       # CLASSPATH required due to CC-2422
-      CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.5.0.jar
+      CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.5.1-0.jar
       CONNECT_PRODUCER_INTERCEPTOR_CLASSES: "io.confluent.monitoring.clients.interceptor.MonitoringProducerInterceptor"
       CONNECT_CONSUMER_INTERCEPTOR_CLASSES: "io.confluent.monitoring.clients.interceptor.MonitoringConsumerInterceptor"
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
       CONNECT_LOG4J_LOGGERS: org.apache.zookeeper=ERROR,org.I0Itec.zkclient=ERROR,org.reflections=ERROR
 
   control-center:
-    image: confluentinc/cp-enterprise-control-center:7.5.0
+    image: confluentinc/cp-enterprise-control-center:7.5.x-latest
     hostname: control-center
     container_name: control-center
     depends_on:
@@ -107,7 +107,7 @@ services:
       PORT: 9021
 
   ksqldb-server:
-    image: confluentinc/cp-ksqldb-server:7.5.0
+    image: confluentinc/cp-ksqldb-server:7.5.x-latest
     hostname: ksqldb-server
     container_name: ksqldb-server
     depends_on:
@@ -130,7 +130,7 @@ services:
       KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: 'true'
 
   ksqldb-cli:
-    image: confluentinc/cp-ksqldb-cli:7.5.0
+    image: confluentinc/cp-ksqldb-cli:7.5.x-latest
     container_name: ksqldb-cli
     depends_on:
       - broker
@@ -140,7 +140,7 @@ services:
     tty: true
 
   ksql-datagen:
-    image: confluentinc/ksqldb-examples:7.5.0
+    image: confluentinc/ksqldb-examples:7.5.x-latest
     hostname: ksql-datagen
     container_name: ksql-datagen
     depends_on:
@@ -162,7 +162,7 @@ services:
       STREAMS_SCHEMA_REGISTRY_PORT: 8081
 
   rest-proxy:
-    image: confluentinc/cp-kafka-rest:7.5.0
+    image: confluentinc/cp-kafka-rest:7.5.x-latest
     depends_on:
       - broker
       - schema-registry

diff --git a/github-actions-example/pom.xml b/github-actions-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>rest-utils-parent</artifactId>
-        <version>7.5.0</version>
+        <version>7.5.1-0</version>
     </parent>
 
     <groupId>io.confluent</groupId>
@@ -18,7 +18,7 @@
         <schemaRegistryUrl></schemaRegistryUrl>
         <schemaRegistryBasicAuthUserInfo></schemaRegistryBasicAuthUserInfo>
         <newSchema>schemas/Count.avsc</newSchema>
-        <confluent.version>7.5.0</confluent.version>
+        <confluent.version>7.5.1-0</confluent.version>
     </properties>
 
     <repositories>