Merge branch 'master' into pr_merge_from_11_2_x_to_master

confluentinc · Apr 8, 2024 · 70e8220 · 70e8220
2 parents 37d6b47 + 1ad1e8d
commit 70e8220
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 17 deletions.
diff --git a/.semaphore/project_public.yml b/.semaphore/project_public.yml
@@ -0,0 +1,25 @@
+# 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: kafka-connect-storage-common
+  description: ""
+spec:
+  visibility: public
+  repository:
+    url: [email protected]:confluentinc/kafka-connect-storage-common.git
+    run_on:
+    - forked_pull_requests
+    pipeline_file: .semaphore/semaphore.yml
+    integration_type: github_app
+    status:
+      pipeline_files:
+      - path: .semaphore/semaphore.yml
+        level: pipeline
+    forked_pull_requests:
+      allowed_contributors:
+        - "ConfluentSemaphore"
diff --git a/avatica-shaded/pom.xml b/avatica-shaded/pom.xml
@@ -16,7 +16,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-common-avatica-shaded</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-common</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-core</artifactId>

diff --git a/format/pom.xml b/format/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-format</artifactId>

diff --git a/hadoop-shaded-guava/pom.xml b/hadoop-shaded-guava/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-common-hadoop-shaded-guava</artifactId>
@@ -84,13 +84,15 @@
                                 </relocation>
                             </relocations>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
                                     <resources>
                                         <resource>NOTICE</resource>
                                         <resource>LICENSE</resource>
                                     </resources>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
                                     <resource>META-INF/LICENSE.txt</resource>
                                     <file>${basedir}/../LICENSE-binary</file>
                                 </transformer>

diff --git a/hadoop-shaded-protobuf/pom.xml b/hadoop-shaded-protobuf/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-common-hadoop-shaded-protobuf</artifactId>

diff --git a/hive/pom.xml b/hive/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-hive</artifactId>

diff --git a/htrace-core4-shaded/pom.xml b/htrace-core4-shaded/pom.xml
@@ -16,7 +16,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-common-htrace-core4-shaded</artifactId>

diff --git a/package-kafka-connect-storage-common/pom.xml b/package-kafka-connect-storage-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-common-package</artifactId>

diff --git a/partitioner/pom.xml b/partitioner/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-partitioner</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
 
     <artifactId>kafka-connect-storage-common-parent</artifactId>
     <packaging>pom</packaging>
-    <version>11.2.10-SNAPSHOT</version>
+    <version>11.3.0-SNAPSHOT</version>
     <name>kafka-connect-storage-common-parent</name>
     <organization>
         <name>Confluent, Inc.</name>
@@ -49,7 +49,7 @@
         <connection>scm:git:git://github.com/confluentinc/kafka-connect-storage-common.git</connection>
         <developerConnection>scm:git:[email protected]:confluentinc/kafka-connect-storage-common.git</developerConnection>
         <url>https://github.com/confluentinc/kafka-connect-storage-common</url>
-        <tag>11.2.x</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
@@ -84,7 +84,7 @@
         <jetty.version>9.4.51.v20230217</jetty.version>
         <jline.version>2.12.1</jline.version>
         <joda.version>2.9.6</joda.version>
-        <kafka.connect.storage.common.version>11.2.10-SNAPSHOT</kafka.connect.storage.common.version>
+        <kafka.connect.storage.common.version>11.3.0-SNAPSHOT</kafka.connect.storage.common.version>
         <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
         <netty.version>4.1.107.Final</netty.version>
         <parquet.version>1.11.2</parquet.version>

diff --git a/service.yml b/service.yml
@@ -11,4 +11,8 @@ semaphore:
   cve_scan: true
   extra_deploy_args: -Dcloud -Pjenkins
   extra_build_args: -Dcloud -Pjenkins
-  run_pint_merge: true
+  run_pint_merge: true
+code_artifact:
+  enable: true
+  package_paths:
+    - maven-snapshots/maven/io.confluent/kafka-connect-storage-*
diff --git a/wal/pom.xml b/wal/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-connect-storage-common-parent</artifactId>
-        <version>11.2.10-SNAPSHOT</version>
+        <version>11.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kafka-connect-storage-wal</artifactId>