From 3c38a901a8bb990986ac1253ebf91aa9c4c1a776 Mon Sep 17 00:00:00 2001
From: Benjamin Van der Smissen <benjamin.vandersmissen@xenit.eu>
Date: Mon, 27 May 2024 10:49:33 +0200
Subject: [PATCH] DOCKER-450 [Test] sonar exclude tomcat 8.5 - 9

---
 tomcat-base/tomcat-embedded-10/overload.gradle  |  2 +-
 tomcat-base/tomcat-embedded-8.5/overload.gradle |  9 +++++----
 tomcat-base/tomcat-embedded-9/overload.gradle   | 11 ++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tomcat-base/tomcat-embedded-10/overload.gradle b/tomcat-base/tomcat-embedded-10/overload.gradle
index 4d2ead7c..a3ba078f 100644
--- a/tomcat-base/tomcat-embedded-10/overload.gradle
+++ b/tomcat-base/tomcat-embedded-10/overload.gradle
@@ -3,7 +3,7 @@ ext {
             version: '10.1.23'
     ]
 }
-
+// We only "test" this code via sonarcube. Otherwise we get duplicate code errors
 sonarqube {
     properties {
         property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared"
diff --git a/tomcat-base/tomcat-embedded-8.5/overload.gradle b/tomcat-base/tomcat-embedded-8.5/overload.gradle
index 64a3d86b..7a550d25 100644
--- a/tomcat-base/tomcat-embedded-8.5/overload.gradle
+++ b/tomcat-base/tomcat-embedded-8.5/overload.gradle
@@ -3,8 +3,9 @@ ext {
             version: '8.5.78'
     ]
 }
-//sonarqube {
-//    properties {
+sonarqube {
+    properties {
 //        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared/main/java"
-//    }
-//}
\ No newline at end of file
+        property "sonar.exclusions", "$project.parent.projectDir/src/shared/main/java"
+    }
+}
\ No newline at end of file
diff --git a/tomcat-base/tomcat-embedded-9/overload.gradle b/tomcat-base/tomcat-embedded-9/overload.gradle
index 312d1386..45f21399 100644
--- a/tomcat-base/tomcat-embedded-9/overload.gradle
+++ b/tomcat-base/tomcat-embedded-9/overload.gradle
@@ -3,8 +3,9 @@ ext {
             version: '9.0.59'
     ]
 }
-//sonarqube {
-//    properties {
-//        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared"
-//    }
-//}
\ No newline at end of file
+sonarqube {
+    properties {
+//        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared/main/java"
+        property "sonar.exclusions", "$project.parent.projectDir/src/shared/main/java"
+    }
+}
\ No newline at end of file