From 4a4ee4ec473c3e536015a065b16f1dd86fc2c20a Mon Sep 17 00:00:00 2001
From: Kunal Gupta <kugupta@confluent.io>
Date: Mon, 23 Dec 2024 10:49:23 -0500
Subject: [PATCH] Merge conflicts

---
 jacoco-aggregate-schema-registry/pom.xml | 2 +-
 pom.xml                                  | 1 -
 sonar-project.properties                 | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/jacoco-aggregate-schema-registry/pom.xml b/jacoco-aggregate-schema-registry/pom.xml
index 4573dc17cae..33c4b20fb5d 100644
--- 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
index 0523a0e9655..2f424d47c66 100644
--- 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
index 4bdb715353f..f1bee2d1cc9 100644
--- 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=.