From a373b00e5bb6689bf28084e8f2503972534c7b18 Mon Sep 17 00:00:00 2001 From: abilan Date: Mon, 27 Mar 2023 10:35:56 -0400 Subject: [PATCH] Upgrade dependencies; prepare for release --- build.gradle | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 24668ea..9b96e20 100644 --- a/build.gradle +++ b/build.gradle @@ -7,11 +7,11 @@ plugins { id 'eclipse' id 'idea' id 'jacoco' - id 'org.sonarqube' version '3.3' + id 'org.sonarqube' version '4.0.0.2929' id 'checkstyle' id 'org.ajoberstar.grgit' version '4.1.1' id 'io.spring.dependency-management' version '1.1.0' - id 'com.jfrog.artifactory' version '4.30.1' + id 'com.jfrog.artifactory' version '4.31.7' } description = 'Spring Integration AWS Support' @@ -30,16 +30,16 @@ repositories { } ext { - assertjVersion = '3.23.1' + assertjVersion = '3.24.2' awaitilityVersion = '4.2.0' - awsSdkVersion = '2.20.22' - jacksonVersion = '2.14.1' - junitVersion = '5.9.1' - servletApiVersion = '6.0.0' + awsSdkVersion = '2.20.32' + jacksonVersion = '2.14.2' + junitVersion = '5.9.2' log4jVersion = '2.19.0' - springCloudAwsVersion = '3.0.0-RC1' + servletApiVersion = '6.0.0' + springCloudAwsVersion = '3.0.0-RC2' springIntegrationVersion = '6.0.4' - kinesisClientVersion = '2.4.5' + kinesisClientVersion = '2.4.8' kinesisProducerVersion = '0.15.5' testcontainersVersion = '1.17.6' @@ -104,7 +104,7 @@ jacoco { checkstyle { configDirectory.set(rootProject.file('src/checkstyle')) - toolVersion = '10.8.0' + toolVersion = '10.9.2' } dependencies { @@ -143,7 +143,6 @@ dependencies { testRuntimeOnly 'org.apache.logging.log4j:log4j-core' testRuntimeOnly 'org.apache.logging.log4j:log4j-jcl' - testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl' testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' @@ -189,16 +188,15 @@ test { } jacocoTestReport { + dependsOn test reports { - csv.required = false + xml.required = true html.required = false - xml.outputLocation = file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") } } check.dependsOn javadoc -build.dependsOn jacocoTestReport - +tasks['sonarqube'].dependsOn jacocoTestReport task updateCopyrights { onlyIf { !isCI } @@ -231,15 +229,13 @@ task updateCopyrights { compileJava.dependsOn updateCopyrights -sonarqube { +sonar { properties { - property 'sonar.jacoco.reportPath', "${buildDir.name}/jacoco.exec" 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 - property 'sonar.java.coveragePlugin', 'jacoco' } }