From 420621923287e474499542c8b8df5e06a8467b26 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@sonarsource.com>
Date: Thu, 12 Dec 2024 14:36:00 +0100
Subject: [PATCH] Integrate changes from cloud-native-gradle-modules

---
 .gitmodules             |  1 -
 build-logic             |  2 +-
 build.gradle            | 24 ------------------------
 its/plugin/build.gradle |  1 +
 its/ruling/build.gradle |  1 +
 settings.gradle         |  1 +
 6 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index df4aa593..73aed1c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,4 +13,3 @@
 [submodule "build-logic"]
 	path = build-logic
 	url = https://github.com/SonarSource/cloud-native-gradle-modules
-	branch = SONARGO-52
diff --git a/build-logic b/build-logic
index ee1ab073..14a35c8a 160000
--- a/build-logic
+++ b/build-logic
@@ -1 +1 @@
-Subproject commit ee1ab07379579ff56a9c9d950dabe1c528490c41
+Subproject commit 14a35c8a3ca4546308e1e638a4b0e581deacc059
diff --git a/build.gradle b/build.gradle
index 2ce60cf4..ad814196 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ import java.util.jar.JarInputStream
 
 plugins {
     id 'java'
-    id 'jacoco'
     id 'com.jfrog.artifactory' version '4.28.2'
     id 'org.sonarqube' version '3.5.0.2730'
     id 'de.thetaphi.forbiddenapis' version '3.0' apply false
@@ -11,7 +10,6 @@ plugins {
 
 allprojects {
     apply plugin: 'java'
-    apply plugin: 'jacoco'
     apply plugin: 'com.jfrog.artifactory'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
@@ -66,23 +64,6 @@ subprojects {
 
     apply plugin: 'com.diffplug.spotless'
 
-    jacoco {
-        toolVersion = "0.8.7"
-    }
-
-    jacocoTestReport {
-        reports {
-            xml.required = true
-            csv.required = false
-            html.required = false
-        }
-    }
-
-    // when subproject has Jacoco pLugin applied we want to generate XML report for coverage
-    plugins.withType(JacocoPlugin) {
-        tasks["test"].finalizedBy 'jacocoTestReport'
-    }
-
     configurations {
         // include compileOnly dependencies during test
         testCompile.extendsFrom compileOnly
@@ -95,11 +76,6 @@ subprojects {
     }
 
     test {
-        testLogging {
-            exceptionFormat 'full' // log the full stack trace (default is the 1st line of the stack trace)
-            events "skipped", "failed"
-            // verbose log for failed and skipped tests (by default the name of the tests are not logged)
-        }
         def propKeys = System.properties.findAll {
             it.key.startsWith("orchestrator") || it.key.startsWith("sonar") || it.key == "buildNumber" || it.key == "slangVersion"
         }.collect { it.key }
diff --git a/its/plugin/build.gradle b/its/plugin/build.gradle
index f3a4b67b..7a9c0508 100644
--- a/its/plugin/build.gradle
+++ b/its/plugin/build.gradle
@@ -8,6 +8,7 @@ dependencies {
     testImplementation testLibs.assertj.core
     testImplementation testLibs.sonarlint.core
     testImplementation testLibs.sonar.orchestrator
+    testRuntimeOnly testLibs.junit.vintage.engine
 }
 
 sonarqube.skipProject = true
diff --git a/its/ruling/build.gradle b/its/ruling/build.gradle
index f6a1301d..dda1c08b 100644
--- a/its/ruling/build.gradle
+++ b/its/ruling/build.gradle
@@ -6,6 +6,7 @@ dependencies {
     testImplementation libs.sonar.analyzer.commons
     testImplementation testLibs.assertj.core
     testImplementation testLibs.sonar.orchestrator
+    testRuntimeOnly testLibs.junit.vintage.engine
 }
 
 sonarqube.skipProject = true
diff --git a/settings.gradle b/settings.gradle
index dae0628f..0ba7343b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -41,6 +41,7 @@ dependencyResolutionManagement {
             library("assertj-core", "org.assertj", "assertj-core").version("3.26.3")
             library("junit-jupiter-api", "org.junit.jupiter", "junit-jupiter-api").version("5.11.0")
             library("junit-jupiter-engine", "org.junit.jupiter", "junit-jupiter-engine").version("5.11.0")
+            library("junit-vintage-engine", "org.junit.vintage", "junit-vintage-engine").version("5.11.0")
         }
     }
 }