diff --git a/.github/workflows/health-argocd-local-ci.yml b/.github/workflows/health-argocd-local-ci.yml index b5a35c24..2e431756 100644 --- a/.github/workflows/health-argocd-local-ci.yml +++ b/.github/workflows/health-argocd-local-ci.yml @@ -16,8 +16,8 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 - - uses: leafo/gh-actions-lua@v10 - - uses: leafo/gh-actions-luarocks@v4 + - uses: leafo/gh-actions-lua@v11 + - uses: leafo/gh-actions-luarocks@v5 - name: Test run: | luarocks --server=https://rocks.moonscript.org install lyaml diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 77d37ea9..197e81b8 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -32,7 +32,7 @@ jobs: # Download from previous workflow: https://github.com/dawidd6/action-download-artifact - name: Download artifact - uses: dawidd6/action-download-artifact@v8 + uses: dawidd6/action-download-artifact@v9 with: workflow: ${{ github.event.workflow_run.workflow_id }} run_id: ${{ github.event.workflow_run.id }} diff --git a/build.gradle b/build.gradle index 870de594..4e8219b9 100644 --- a/build.gradle +++ b/build.gradle @@ -66,16 +66,15 @@ dependencies { implementation enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}") annotationProcessor enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}") implementation enforcedPlatform('org.eclipse.jetty:jetty-bom:11.0.24') + implementation enforcedPlatform('org.jetbrains.kotlin:kotlin-bom:2.1.10') + annotationProcessor enforcedPlatform("org.slf4j:slf4j-bom:${slf4jVersion}") + implementation enforcedPlatform("org.slf4j:slf4j-bom:${slf4jVersion}") implementation "io.javaoperatorsdk:operator-framework:${operatorFrameworkVersion}", { - // self managed to avoid conflicts - exclude group: "org.slf4j" // recheck when operator-framework is upgraded exclude group: 'com.squareup.okio', module: 'okio' } annotationProcessor "io.javaoperatorsdk:operator-framework:${operatorFrameworkVersion}", { - // self managed to avoid conflicts - exclude group: "org.slf4j" // recheck when operator-framework is upgraded exclude group: 'com.squareup.okio', module: 'okio' } @@ -87,19 +86,11 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator:8.0.2.Final' implementation 'jakarta.el:jakarta.el-api:6.0.1' implementation 'org.bouncycastle:bcpkix-jdk18on:1.80' - implementation "io.javalin:javalin:6.4.0", { - // self managed to avoid conflicts - exclude group: "org.slf4j" - // conflict with Kotlin version in Okio 3.9.0 - exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8" - } + implementation "io.javalin:javalin:6.4.0" // logging - annotationProcessor "org.slf4j:slf4j-api:${slf4jVersion}" - implementation "org.slf4j:slf4j-api:${slf4jVersion}" - implementation 'ch.qos.logback:logback-classic:1.5.17', { - exclude group: "org.slf4j", module: "slf4j-api" - } + implementation "org.slf4j:slf4j-api" + implementation 'ch.qos.logback:logback-classic:1.5.17' implementation "ch.qos.logback.contrib:logback-json-classic:${logbackContribVersion}", { exclude group: "ch.qos.logback", module: "logback-classic" exclude group: "ch.qos.logback", module: "logback-core" @@ -121,7 +112,6 @@ dependencies { } // try to replace local commons-compress management on update! testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo:4.18.1', { - exclude group: "org.slf4j", module: "slf4j-api" // newer version from operator-framework exclude group: "org.apache.commons", module: "commons-lang3" } @@ -139,18 +129,14 @@ dependencies { } testImplementation 'org.awaitility:awaitility:4.3.0' testImplementation "io.fabric8:kubernetes-server-mock:${kubernetesServerMockVersion}", { - // self managed to avoid conflicts - exclude group: "org.slf4j" exclude group: 'com.squareup.okio', module: 'okio' exclude group: 'junit', module: 'junit' - // vulnerability in 4.1.117.Final } // CVE-2020-15250 in 4.12 // -> pulled transitively from OkHttp3 mockwebserver used by kubernetes-server-mock testImplementation 'junit:junit:4.13.2' testImplementation 'com.squareup.okhttp3:okhttp:4.12.0', { exclude group: 'com.squareup.okio', module: 'okio' - exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8" } }