From cb3ce135b70ddc13711bc9dbe7c013a84f354ef2 Mon Sep 17 00:00:00 2001 From: Ruud Senden <8635138+rsenden@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:45:20 +0100 Subject: [PATCH] chore: Update dependency & Gradle plugin versions --- build.gradle | 7 +++-- fcli-core/fcli-tool/build.gradle | 2 +- fcli-other/fcli-bom/build.gradle | 31 +++++++++++--------- fcli-other/fcli-doc/build.gradle | 6 +--- fcli-other/fcli-functional-test/build.gradle | 4 +-- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index f5e8d93602..7201cc7827 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,9 @@ plugins { - id('com.github.jk1.dependency-license-report') version '2.5' apply false + id('com.github.jk1.dependency-license-report') version '2.6' apply false id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id "org.asciidoctor.jvm.convert" version "3.3.2" apply false - id "io.freefair.lombok" version "8.1.0" apply false + id "org.asciidoctor.jvm.convert" version "4.0.2" apply false + //id "org.asciidoctor.jvm.convert" version "3.3.2" apply false + id "io.freefair.lombok" version "8.6" apply false } group = "com.fortify.cli" diff --git a/fcli-core/fcli-tool/build.gradle b/fcli-core/fcli-tool/build.gradle index a94c467c3a..df6b2e59b2 100644 --- a/fcli-core/fcli-tool/build.gradle +++ b/fcli-core/fcli-tool/build.gradle @@ -1,5 +1,5 @@ plugins { - id "de.undercouch.download" version "5.5.0" + id "de.undercouch.download" version "5.6.0" } apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" diff --git a/fcli-other/fcli-bom/build.gradle b/fcli-other/fcli-bom/build.gradle index 236a6cc0ed..637babf84c 100644 --- a/fcli-other/fcli-bom/build.gradle +++ b/fcli-other/fcli-bom/build.gradle @@ -9,25 +9,25 @@ javaPlatform { } dependencies { - api platform('com.fasterxml.jackson:jackson-bom:2.15.2') - api platform('org.springframework:spring-framework-bom:6.0.11') + api platform('com.fasterxml.jackson:jackson-bom:2.17.0') + api platform('org.springframework:spring-framework-bom:6.1.5') constraints { // Picocli - api("info.picocli:picocli:4.7.4") - api("info.picocli:picocli-codegen:4.7.4") + api("info.picocli:picocli:4.7.5") + api("info.picocli:picocli-codegen:4.7.5") // Annotation-based reflect-config.json generation api('com.formkiq:graalvm-annotations:1.2.0') api('com.formkiq:graalvm-annotations-processor:1.4.1') // ANSI support - api("org.fusesource.jansi:jansi:2.4.0") + api("org.fusesource.jansi:jansi:2.4.1") // Logging - api('org.slf4j:slf4j-api:2.0.7') - api('org.slf4j:jcl-over-slf4j:2.0.7') - api("ch.qos.logback:logback-classic:1.4.8") + api('org.slf4j:slf4j-api:2.0.12') + api('org.slf4j:jcl-over-slf4j:2.0.12') + api("ch.qos.logback:logback-classic:1.5.3") // REST client api('com.konghq:unirest-java:3.14.5') @@ -39,7 +39,7 @@ dependencies { //api('org.springframework.integration:spring-integration-core:6.1.1') // Output formatting - api('hu.webarticum:tree-printer:3.1.0') + api('hu.webarticum:tree-printer:3.2.0') api('com.github.freva:ascii-table:1.8.0') // Remove annotation processor warning. @@ -49,11 +49,14 @@ dependencies { api('org.jasypt:jasypt:1.9.3:lite') // Test dependencies - api 'org.junit.jupiter:junit-jupiter-api:5.9.3' - api 'org.junit.jupiter:junit-jupiter-params:5.9.3' - api 'org.junit.jupiter:junit-jupiter-engine:5.9.3' + api 'org.junit.jupiter:junit-jupiter-api:5.10.2' + api 'org.junit.jupiter:junit-jupiter-params:5.10.2' + api 'org.junit.jupiter:junit-jupiter-engine:5.10.2' - //required for unpacking tar.gz (debricked cli) - api('org.apache.commons:commons-compress:1.25.0') + // Required for unpacking tar.gz (debricked cli) + api('org.apache.commons:commons-compress:1.26.1') + + // Used for processing HTML text returned by SSC/FoD endpoints like issue summaries/details/... + api('org.jsoup:jsoup:1.17.2') } } \ No newline at end of file diff --git a/fcli-other/fcli-doc/build.gradle b/fcli-other/fcli-doc/build.gradle index daff809f79..9c9d125f9d 100644 --- a/fcli-other/fcli-doc/build.gradle +++ b/fcli-other/fcli-doc/build.gradle @@ -30,7 +30,6 @@ task generateManpageAsciiDoc(type: JavaExec) { task generateManpageOutput(type: org.asciidoctor.gradle.jvm.AsciidoctorTask) { dependsOn(generateManpageAsciiDoc) - inProcess = JAVA_EXEC forkOptions { jvmArgs("--add-opens","java.base/sun.nio.ch=ALL-UNNAMED","--add-opens","java.base/java.io=ALL-UNNAMED") } @@ -57,8 +56,7 @@ task prepareAsciiDocForVersionedHtml(type: Copy) { // Generate HTML documentation from AsciiDoc prepared by prepareAsciiDocForVersionedHtml task asciiDoctorVersionedHtml(type: org.asciidoctor.gradle.jvm.AsciidoctorTask) { dependsOn(prepareAsciiDocForVersionedHtml) - inProcess = JAVA_EXEC - forkOptions { + forkOptions { jvmArgs("--add-opens","java.base/sun.nio.ch=ALL-UNNAMED","--add-opens","java.base/java.io=ALL-UNNAMED") } sourceDir = file("${htmlAsciiDocDir}") @@ -84,7 +82,6 @@ task asciiDoctorVersionedHtml(type: org.asciidoctor.gradle.jvm.AsciidoctorTask) // to be deployed to a version-specific directory on the fcli gh-pages site task asciiDoctorVersionedJekyll(type: org.asciidoctor.gradle.jvm.AsciidoctorTask) { dependsOn(prepareAsciiDocForVersionedHtml) - inProcess = JAVA_EXEC forkOptions { jvmArgs("--add-opens","java.base/sun.nio.ch=ALL-UNNAMED","--add-opens","java.base/java.io=ALL-UNNAMED") } @@ -111,7 +108,6 @@ task asciiDoctorVersionedJekyll(type: org.asciidoctor.gradle.jvm.AsciidoctorTask // Generate Jekyll HTML documentation from AsciiDoc files in ${staticAsciiDocSrcDir} // to be deployed to the root directory on the fcli gh-pages site task asciiDoctorStaticJekyll(type: org.asciidoctor.gradle.jvm.AsciidoctorTask) { - inProcess = JAVA_EXEC forkOptions { jvmArgs("--add-opens","java.base/sun.nio.ch=ALL-UNNAMED","--add-opens","java.base/java.io=ALL-UNNAMED") } diff --git a/fcli-other/fcli-functional-test/build.gradle b/fcli-other/fcli-functional-test/build.gradle index f453251272..15eb6c79d5 100644 --- a/fcli-other/fcli-functional-test/build.gradle +++ b/fcli-other/fcli-functional-test/build.gradle @@ -5,11 +5,11 @@ testing { ftest(JvmTestSuite) { useJUnitJupiter() dependencies { - implementation platform('org.apache.groovy:groovy-bom:4.0.13') + implementation platform('org.apache.groovy:groovy-bom:4.0.20') implementation 'org.apache.groovy:groovy' implementation platform("org.spockframework:spock-bom:2.3-groovy-4.0") implementation "org.spockframework:spock-core" - implementation 'org.junit.platform:junit-platform-launcher:1.9.3' + implementation 'org.junit.platform:junit-platform-launcher:1.10.2' if ( !project.hasProperty('ftest.fcli') || project.property('ftest.fcli')=='build' ) { implementation project("${fcliAppRef}") }