From f9a77d3f634ee4a63b87e2d06ea76e8022e0a542 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 30 Jan 2024 08:31:06 -0500 Subject: [PATCH] Remove sonar and jacoco plugins --- build.gradle | 40 +++------------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index c83f612e..fe09ec14 100644 --- a/build.gradle +++ b/build.gradle @@ -2,19 +2,15 @@ buildscript { repositories { mavenCentral() gradlePluginPortal() - maven { url 'https://repo.spring.io/plugins-release-local' } maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } } dependencies { + classpath 'io.spring.gradle:dependency-management-plugin:1.1.0' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" - classpath 'gradle.plugin.org.gretty:gretty:2.3.1' + classpath 'org.gretty:gretty:4.0.3' } } -plugins { - id 'org.sonarqube' version '2.8' - id 'io.spring.dependency-management' version '1.1.4' -} description = 'Spring Integration Samples' @@ -35,7 +31,6 @@ allprojects { repositories { mavenCentral() - maven { url 'https://repo.spring.io/release' } maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } // maven { url 'https://repo.spring.io/libs-staging-local' } @@ -57,7 +52,6 @@ subprojects { subproject -> if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'dsl', 'cafe'])) { apply plugin: 'java-library' - apply plugin: 'jacoco' apply plugin: 'io.spring.dependency-management' apply plugin: 'maven-publish' @@ -123,6 +117,7 @@ subprojects { subproject -> url = linkIssue } withXml { + asNode().appendNode('properties')appendNode('java.version', java.sourceCompatibility) if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { asNode().appendNode('packaging', 'war') def plugins = asNode().build?.find()?.plugins?.find() @@ -204,10 +199,6 @@ subprojects { subproject -> } } - jacoco { - toolVersion = '0.8.8' - } - compileJava { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -305,25 +296,10 @@ subprojects { subproject -> ext.xLintArg = '-Xlint:all,-options,-processing' [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] - jacocoTestReport { - reports { - xml.enabled true - csv.enabled false - html.enabled false - xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") - } - } - test { useJUnitPlatform() // suppress all console output during testing unless running `gradle -i` logging.captureStandardOutput(LogLevel.INFO) - jacoco { - destinationFile = file("$buildDir/jacoco.exec") - } - if (System.properties['sonar.host.url']) { - finalizedBy jacocoTestReport - } } } @@ -1553,13 +1529,3 @@ project('tcp-with-headers') { standardInput = System.in } } - -sonarqube { - properties { - property 'sonar.links.homepage', linkHomepage - property 'sonar.links.ci', linkCi - property 'sonar.links.issue', linkIssue - property 'sonar.links.scm', linkScmUrl - property 'sonar.links.scm_dev', linkScmDevConnection - } -}