Skip to content

Commit

Permalink
Integrate changes from cloud-native-gradle-modules
Browse files Browse the repository at this point in the history
  • Loading branch information
petertrr committed Dec 12, 2024
1 parent 3fc4fa8 commit 4206219
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 26 deletions.
1 change: 0 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@
[submodule "build-logic"]
path = build-logic
url = https://github.com/SonarSource/cloud-native-gradle-modules
branch = SONARGO-52
24 changes: 0 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -11,7 +10,6 @@ plugins {

allprojects {
apply plugin: 'java'
apply plugin: 'jacoco'
apply plugin: 'com.jfrog.artifactory'
apply plugin: 'maven-publish'
apply plugin: 'signing'
Expand Down Expand Up @@ -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
Expand All @@ -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 }
Expand Down
1 change: 1 addition & 0 deletions its/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions its/ruling/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
Expand Down

0 comments on commit 4206219

Please sign in to comment.