Merge branch '7.9.x' into master

pom.xml

@@ -90,6 +90,8 @@
         <jaxb.version>2.3.0</jaxb.version>
         <netty.version>4.1.113.Final</netty.version>
         <hamcrest.version>1.3</hamcrest.version>
+        <!-- okio version to match ce-kafka 7.8.x -->
+        <okio.version>3.7.0</okio.version>
         <protobuf.version>3.25.5</protobuf.version>
         <powermock.version>2.0.9</powermock.version>
         <!-- Potentially used by downstream projects -->
@@ -238,6 +240,12 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commons-io.version}</version>
             </dependency>
+            <!-- This is to match to okio version used in ce-flink / ce-kafka 7.8  -->
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${okio.version}</version>
+            </dependency>
             <!-- This is to unify the version of Protocol Buffers across CP -->
             <dependency>
                 <groupId>com.google.protobuf</groupId>