Merge conflicts

confluentinc · Dec 23, 2024 · 4a4ee4e · 4a4ee4e
1 parent b9e7f30
commit 4a4ee4e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/jacoco-aggregate-schema-registry/pom.xml b/jacoco-aggregate-schema-registry/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-schema-registry-parent</artifactId>
-        <version>7.0.17-0</version>
+        <version>7.6.5-0</version>
     </parent>
 
     <artifactId>jacoco-aggregate-schema-registry</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,6 @@
         <module>client-encryption-hcvault</module>
         <module>client-encryption</module>
         <module>benchmark</module>
-        <module>jacoco-aggregate-schema-registry</module>
     </modules>
 
     <properties>

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -4,8 +4,6 @@ sonar.coverage.jacoco.xmlReportPaths=**/jacoco.xml
 sonar.cpd.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test*
 sonar.exclusions=protobuf-serializer/**
 sonar.java.binaries=.
-sonar.exclusions=**/*.pb.*,**/mk-include/**/*
-sonar.java.binaries=core
 sonar.language=java
 sonar.projectKey=schema-registry
-sonar.sources=core
+sonar.sources=.