Merge pull request #757 from confluentinc/pr_merge_from_11_0_x_to_11_1_x

Merge Conflict Resolution (from 11.0.x to 11.1.x)

Author: sp-gupta

.semaphore/semaphore.yml

@@ -40,13 +40,14 @@ blocks:
             - pip install confluent-release-tools -q
             - . sem-pint
             - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
-            - . cve-scan
+            - cve-scan
             - . cache-maven store
       epilogue:
         always:
           commands:
             - . publish-test-results
             - artifact push workflow target/test-results
+            - artifact push workflow target
 
   - name: Release
     dependencies: ["Test"]
@@ -59,7 +60,7 @@ blocks:
             - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
               -DrepositoryId=confluent-codeartifact-internal deploy -DskipTests
   - name: Release Notes
-    dependencies: [ ]
+    dependencies: []
     run:
       when: "branch =~ '[0-9]+\\.[0-9]+\\.x'"
     task:
@@ -69,7 +70,6 @@ blocks:
             - git clone --branch master --single-branch [email protected]:confluentinc/connect-releases.git
             - ./connect-releases/tasks/release-connect-plugins/generate-connect-changelogs.sh
 
-
 after_pipeline:
   task:
     agent:
@@ -86,4 +86,5 @@ after_pipeline:
         commands:
           - checkout
           - sem-version java 11
-          - emit-sonarqube-data -a test-results
+          - artifact pull workflow target
+          - emit-sonarqube-data --run_only_sonar_scan

Jenkinsfile

@@ -42,7 +42,7 @@
         <hamcrest.version>1.3</hamcrest.version>
         <mockito.version>2.28.2</mockito.version>
         <gson.version>2.8.6</gson.version>
-        <test.containers.version>1.15.0</test.containers.version>
+        <test.containers.version>1.15.3</test.containers.version>
         <kafka.connect.maven.plugin.version>0.11.1</kafka.connect.maven.plugin.version>
         <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
         <hadoop.version>3.3.0</hadoop.version>

pom.xml

@@ -0,0 +1,8 @@
+### service-bot sonarqube plugin managed file
+sonar.coverage.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test*
+sonar.coverage.jacoco.xmlReportPaths=**/jacoco.xml
+sonar.exclusions=**/*.pb.*,**/mk-include/**/*
+sonar.java.binaries=.
+sonar.language=java
+sonar.projectKey=kafka-connect-elasticsearch
+sonar.sources=.