Merge branch '10.0.x' into 11.0.x

ConfluentJenkins · ConfluentJenkins · commit 5eefe884241c · 2023-12-04T05:44:39.000Z
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,4 +4,6 @@ common {
   upstreamProjects = 'confluentinc/common'
   pintMerge = true
   downStreamValidate = false
+  nodeLabel = 'docker-oraclejdk8'
+  sonarqubeScannerEnable = true
 }
diff --git a/pom.xml b/pom.xml
@@ -324,7 +324,7 @@
                                         <limit>
                                             <counter>INSTRUCTION</counter>
                                             <value>COVEREDRATIO</value>
-                                            <minimum>0.85</minimum>
+                                            <minimum>0.80</minimum>
                                         </limit>
                                         <limit>
                                             <counter>BRANCH</counter>
@@ -359,7 +359,7 @@
                     </execution>
                     <execution>
                         <id>report</id>
-                        <phase>test</phase>
+                        <phase>verify</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1,8 @@
+sonar.projectKey=kafka-connect-elasticsearch
+sonar.sources=src/main/java
+sonar.java.binaries=target/classes/**
+sonar.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test*
+sonar.test.inclusions=**/*Test.java,**/*IT.java
+sonar.coverage.jacoco.xmlReportPaths=**/jacoco.xml
+sonar.java.tests.reportPaths=**/surefire/**
+sonar.language=java

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,6 @@ common {`
`4`	`4`	`upstreamProjects = 'confluentinc/common'`
`5`	`5`	`pintMerge = true`
`6`	`6`	`downStreamValidate = false`
	`7`	`+ nodeLabel = 'docker-oraclejdk8'`
	`8`	`+ sonarqubeScannerEnable = true`
`7`	`9`	`}`