Fix the AK-> CCS jenkins job failing

[Honshu Priyadarshi (honshu)]

Fixed the conflict causing the Jenkins job failure from AK-> CCS.
Below are the PRs that caused the conflict.

In AK
apache#14286
apache#13676

In CCS
#901

For #901 and apache#14286 conflict
I have kept the versioning changes of CCS in files
settings.gradle
streams/quickstart/java/pom.xml
streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
streams/quickstart/pom.xml
tests/kafkatest/init.py

For apache#13676 i don't an actual conflict except few function added in AK.
do i brought changes from AK

[cla-assistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 11 committers have signed the CLA.

❌ Phuc-Hong-Tran
❌ bmscomp
❌ yashmayya
❌ satishd
❌ gharris1727
❌ showuon
❌ see-quick
❌ mumrah
❌ mimaison
❌ abhijeetk88
❌ honshu
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[Honshu Priyadarshi (honshu)]

CONFLICTS

➜  kafka git:(fix-master) ✗ git d
diff --cc gradle.properties
index 716e248096,a303a31419..0000000000
--- a/gradle.properties
+++ b/gradle.properties
@@@ -23,8 -23,8 +23,12 @@@ group=org.apache.kafk
  #  - streams/quickstart/pom.xml
  #  - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
  #  - streams/quickstart/java/pom.xml
++<<<<<<< HEAD
 +version=7.6.0-0-ccs
++=======
+ version=3.7.0-SNAPSHOT
++>>>>>>> upstream/trunk
  scalaVersion=2.13.11
  task=build
 -org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
 +org.gradle.jvmargs=-Xmx2g -Xss100m -XX:+UseParallelGC
  org.gradle.parallel=true
diff --cc settings.gradle
index 0f9a3066b1,79af7b84c3..0000000000
--- a/settings.gradle
+++ b/settings.gradle
@@@ -13,6 -13,40 +13,43 @@@
  // See the License for the specific language governing permissions and
  // limitations under the License.
  
++<<<<<<< HEAD
++=======
+ plugins {
+     id 'com.gradle.enterprise' version '3.14.1'
+     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.1'
+ }
+ 
+ def isGithubActions = System.getenv('GITHUB_ACTIONS') != null
+ def isJenkins = System.getenv('JENKINS_URL') != null
+ def isCI = isGithubActions || isJenkins
+ 
+ gradleEnterprise {
+     server = "https://ge.apache.org"
+     buildScan {
+         capture { taskInputFiles = true }
+         uploadInBackground = !isCI
+         publishAlways()
+         publishIfAuthenticated()
+         obfuscation {
+             // This obfuscates the IP addresses of the build machine in the build scan.
+             // Alternatively, the build scan will provide the hostname for troubleshooting host-specific issues.
+             ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0"} }
+         }
+     }
+ }
+ 
+ buildCache {
+     local {
+         enabled = !isCI
+     }
+ 
+     remote(gradleEnterprise.buildCache) {
+         enabled = false
+     }
+ }
+ 
++>>>>>>> upstream/trunk
  include 'clients',
      'connect:api',
      'connect:basic-auth-extension',
diff --cc streams/quickstart/java/pom.xml
index 02d9d9fc1a,d4dbf26827..0000000000
--- a/streams/quickstart/java/pom.xml
+++ b/streams/quickstart/java/pom.xml
@@@ -26,7 -26,7 +26,11 @@@
      <parent>
          <groupId>org.apache.kafka</groupId>
          <artifactId>streams-quickstart</artifactId>
++<<<<<<< HEAD
 +        <version>7.6.0-0-ccs</version>
++=======
+         <version>3.7.0-SNAPSHOT</version>
++>>>>>>> upstream/trunk
          <relativePath>..</relativePath>
      </parent>
  
diff --cc streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
index 3649ed1f4a,74351ac786..0000000000
--- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
+++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
@@@ -29,7 -29,7 +29,11 @@@
  
      <properties>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
++<<<<<<< HEAD
 +        <kafka.version>7.6.0-0-ccs</kafka.version>
++=======
+         <kafka.version>3.7.0-SNAPSHOT</kafka.version>
++>>>>>>> upstream/trunk
          <slf4j.version>1.7.36</slf4j.version>
      </properties>
  
diff --cc streams/quickstart/pom.xml
index 1a5c7aa5f6,69b5f5fb42..0000000000
--- a/streams/quickstart/pom.xml
+++ b/streams/quickstart/pom.xml
@@@ -22,7 -22,7 +22,11 @@@
      <groupId>org.apache.kafka</groupId>
      <artifactId>streams-quickstart</artifactId>
      <packaging>pom</packaging>
++<<<<<<< HEAD
 +    <version>7.6.0-0-ccs</version>
++=======
+     <version>3.7.0-SNAPSHOT</version>
++>>>>>>> upstream/trunk
  
      <name>Kafka Streams :: Quickstart</name>
  
diff --cc tests/kafkatest/__init__.py
index cc68bca890,9ab162964c..0000000000
--- a/tests/kafkatest/__init__.py
+++ b/tests/kafkatest/__init__.py
@@@ -21,5 -21,5 +21,10 @@@
  #
  # Instead, in development branches, the version should have a suffix of the form ".devN"
  #
++<<<<<<< HEAD
 +# For example, when Kafka is at version 1.0.0-0, this should be something like "1.0.0-0.dev0"
 +__version__ = '7.6.0-0.dev0'
++=======
+ # For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0"
+ __version__ = '3.7.0.dev0'
++>>>>>>> upstream/trunk