Conflict resolution, from 7.7.x to 7.8.x

janjwerner-confluent · janjwerner-confluent · commit 6f5a2908d60f · 2024-11-07T14:26:27.000-05:00
diff --git a/.semaphore/project.yml b/.semaphore/project.yml
@@ -0,0 +1,43 @@
+# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
+# template and configurations in service.yml.
+# Modifications in this file will be overwritten by generated content in the nightly run.
+# For more information, please refer to the page:
+# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
+apiVersion: v1alpha
+kind: Project
+metadata:
+  name: common
+  description: ""
+spec:
+  visibility: private
+  repository:
+    url: git@github.com:confluentinc/common.git
+    run_on:
+    - branches
+    - pull_requests
+    pipeline_file: .semaphore/semaphore.yml
+    integration_type: github_app
+    status:
+      pipeline_files:
+      - path: .semaphore/semaphore.yml
+        level: pipeline
+    whitelist:
+      branches:
+      - 'master'
+      - 'main'
+      - '/^\d+\.\d+\.x$/'
+      - '/^gh-readonly-queue.*/'
+  custom_permissions: true
+  debug_permissions:
+  - empty
+  - default_branch
+  - non_default_branch
+  - pull_request
+  - forked_pull_request
+  - tag
+  attach_permissions:
+  - default_branch
+  - non_default_branch
+  - pull_request
+  - forked_pull_request
+  - tag
diff --git a/assembly-plugin-boilerplate/pom.xml b/assembly-plugin-boilerplate/pom.xml
@@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
     <groupId>io.confluent</groupId>
     <artifactId>assembly-plugin-boilerplate</artifactId>
     <packaging>pom</packaging>
-    <version>7.7.2-0</version>
+    <version>7.8.0-0</version>
     <name>${project.artifactId}</name>
     <description>Maven Assembly Plugin boilerplate for Dockerized projects</description>
     <url>https://github.com/confluentinc/common</url>
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.confluent</groupId>
     <artifactId>build-tools</artifactId>
-    <version>7.7.2-0</version>
+    <version>7.8.0-0</version>
     <name>Build Tools</name>
     <url>https://github.com/confluentinc/common</url>
 
diff --git a/config/pom.xml b/config/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <artifactId>common-config</artifactId>
diff --git a/disk-usage-agent/pom.xml b/disk-usage-agent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <properties>
diff --git a/log4j-extensions/pom.xml b/log4j-extensions/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <properties>
diff --git a/log4j2-extensions/pom.xml b/log4j2-extensions/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <properties>
diff --git a/logging/pom.xml b/logging/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <properties>
diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <artifactId>common-metrics</artifactId>
diff --git a/package/pom.xml b/package/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>common-parent</artifactId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <artifactId>common-package</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <artifactId>common</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <groupId>io.confluent</groupId>
     <artifactId>common-parent</artifactId>
     <packaging>pom</packaging>
-    <version>7.7.2-0</version>
+    <version>7.8.0-0</version>
     <name>common</name>
     <organization>
         <name>Confluent, Inc.</name>
@@ -53,8 +53,8 @@
         <azure-identity.version>1.13.0</azure-identity.version>
         <azure-storage.version>12.26.1</azure-storage.version>
         <required.maven.version>3.2</required.maven.version>
-        <kafka.version>[7.7.2-0-ccs, 7.7.3-0-ccs)</kafka.version>
-        <ce.kafka.version>[7.7.2-0-ce, 7.7.3-0-ce)</ce.kafka.version>
+        <kafka.version>[7.8.0-0-ccs, 7.8.1-0-ccs)</kafka.version>
+        <ce.kafka.version>[7.8.0-0-ce, 7.8.1-0-ce)</ce.kafka.version>
         <easymock.version>5.2.0</easymock.version>
         <!-- keep exec-maven-plugin on 1.5.0 until https://github.com/mojohaus/exec-maven-plugin/issues/76 is fixed
              running our LicenseFinder plugin in create-licenses-for-docker breaks when upgrading to 1.6.0 -->
@@ -71,7 +71,7 @@
         <junit.version>4.13.2</junit.version>
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <kafka.scala.version>2.13</kafka.scala.version>
-        <scala.version>2.13.10</scala.version>
+        <scala.version>2.13.11</scala.version>
         <maven-assembly.version>3.3.0</maven-assembly.version>
         <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version>
         <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
@@ -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 -->
@@ -144,7 +146,7 @@
         <docker.pull-image>false</docker.pull-image>
         <docker.imagePullPolicy>IfNotPresent</docker.imagePullPolicy>
         <dependency.check.skip>true</dependency.check.skip>
-        <io.confluent.common.version>7.7.2-0</io.confluent.common.version>
+        <io.confluent.common.version>7.8.0-0</io.confluent.common.version>
         <!-- This is a version of the pom file that we install and deploy because
             the kafka and ce-kafka version ranges are resolved.
         -->
@@ -154,7 +156,7 @@
             resolving the version of ccs and ce kafka. This property should
             never be used any where else.
         -->
-        <confluent.version.range>[7.7.2-0, 7.7.3-0)</confluent.version.range>
+        <confluent.version.range>[7.8.0-0, 7.8.1-0)</confluent.version.range>
         <!-- This is the version range used by resolver-maven-plugin to resolve the
             version of ccs and ce-kafka. This allowed this property to be overridden
             through cmd lines.
@@ -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-jvm</artifactId>
+                <version>${okio.version}</version>
+            </dependency>
             <!-- This is to unify the version of Protocol Buffers across CP -->
             <dependency>
                 <groupId>com.google.protobuf</groupId>
diff --git a/service.yml b/service.yml
@@ -13,3 +13,13 @@ semaphore:
   downstream_projects: ["rest-utils", "ksql", "newwave", "kafka-connect-replicator", "hub-client"]
 git:
   enable: true
+code_artifact:
+  enable: true
+  package_paths:
+    - maven-snapshots/maven/io.confluent/disk-usage-agent
+    - maven-snapshots/maven/io.confluent/common
+    - maven-snapshots/maven/io.confluent/common-*
+    - maven-snapshots/maven/io.confluent/confluent-log4j2-extensions
+    - maven-snapshots/maven/io.confluent/confluent-log4j-extensions
+    - maven-snapshots/maven/io.confluent/build-tools
+    - maven-snapshots/maven/io.confluent/assembly-plugin-boilerplate
diff --git a/utils/pom.xml b/utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>common-parent</artifactId>
         <groupId>io.confluent</groupId>
-        <version>7.7.2-0</version>
+        <version>7.8.0-0</version>
     </parent>
 
     <properties>
