diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2470ef5..3686fa1 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -29,7 +29,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew clean build generateMergedReport dependencyCheckAggregate + run: ./gradlew clean build generateMergedReport #dependencyCheckAggregate - name: copy the reportTest to codeCoverage run: cp build/reports/jacoco/generateMergedReport/generateMergedReport.xml jacoco.xml || echo "Code coverage failed" - name: Push codeCoverage to Codecov diff --git a/async/aws-parameter-store-manager-async/aws-parameter-store-manager-async.gradle b/async/aws-parameter-store-manager-async/aws-parameter-store-manager-async.gradle index 01b3b1c..d064795 100644 --- a/async/aws-parameter-store-manager-async/aws-parameter-store-manager-async.gradle +++ b/async/aws-parameter-store-manager-async/aws-parameter-store-manager-async.gradle @@ -2,7 +2,7 @@ dependencies { api project(":secrets-manager-api") implementation 'software.amazon.awssdk:ssm' implementation 'software.amazon.awssdk:sts' - implementation "com.github.ben-manes.caffeine:caffeine:${cafeineVersion}" + implementation "com.github.ben-manes.caffeine:caffeine:${caffeineVersion}" implementation "io.projectreactor:reactor-core:${reactorCoreVersion}" testImplementation "io.projectreactor:reactor-test:${reactorCoreVersion}" } diff --git a/async/aws-secrets-manager-async/aws-secrets-manager-async.gradle b/async/aws-secrets-manager-async/aws-secrets-manager-async.gradle index 911f727..3d4672f 100644 --- a/async/aws-secrets-manager-async/aws-secrets-manager-async.gradle +++ b/async/aws-secrets-manager-async/aws-secrets-manager-async.gradle @@ -3,7 +3,7 @@ dependencies { implementation 'software.amazon.awssdk:secretsmanager' implementation 'software.amazon.awssdk:sts' implementation "io.projectreactor.addons:reactor-extra:${reactorExtraVersion}" - implementation "com.github.ben-manes.caffeine:caffeine:${cafeineVersion}" + implementation "com.github.ben-manes.caffeine:caffeine:${caffeineVersion}" implementation "io.projectreactor:reactor-core:${reactorCoreVersion}" testImplementation "io.projectreactor:reactor-test:${reactorCoreVersion}" } diff --git a/async/vault-async/vault-async.gradle b/async/vault-async/vault-async.gradle index 1c9aa05..3a0b198 100644 --- a/async/vault-async/vault-async.gradle +++ b/async/vault-async/vault-async.gradle @@ -4,9 +4,9 @@ dependencies { implementation "io.projectreactor.addons:reactor-extra:${reactorExtraVersion}" implementation "io.projectreactor:reactor-core:${reactorCoreVersion}" implementation "com.google.code.gson:gson:${gsonVersion}" - implementation "com.github.ben-manes.caffeine:caffeine:${cafeineVersion}" + implementation "com.github.ben-manes.caffeine:caffeine:${caffeineVersion}" testImplementation "io.projectreactor:reactor-test:${reactorCoreVersion}" - testImplementation("com.squareup.okhttp3:mockwebserver:4.9.3") + testImplementation("com.squareup.okhttp3:mockwebserver:${okHttpVersion}") } ext { diff --git a/build.gradle b/build.gradle index 8fa8bd9..b5e7da3 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { plugins { id "org.sonarqube" version "4.4.1.3373" id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id "org.owasp.dependencycheck" version "9.0.9" +// id "org.owasp.dependencycheck" version "9.0.9" } apply from: './main.gradle' diff --git a/gradle.properties b/gradle.properties index 6a2fb04..92a557e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,10 @@ -version=4.4.0 -springBootVersion=3.2.1 -reactorCoreVersion=3.6.1 +version=4.4.1 +springBootVersion=3.2.4 +reactorCoreVersion=3.6.4 reactorExtraVersion=3.5.1 gradleVersionsVersion=0.47.0 -awsBomVersion=2.23.4 -cafeineVersion=3.1.8 +awsBomVersion=2.25.31 +caffeineVersion=3.1.8 +okHttpVersion=4.12.0 gsonVersion=2.10.1 -lombokVersion=1.18.30 \ No newline at end of file +lombokVersion=1.18.32 \ No newline at end of file diff --git a/main.gradle b/main.gradle index bfee4f7..f504288 100644 --- a/main.gradle +++ b/main.gradle @@ -48,7 +48,7 @@ subprojects { apply plugin: 'java-library' apply plugin: 'maven-publish' apply plugin: 'signing' - apply plugin: 'org.owasp.dependencycheck' +// apply plugin: 'org.owasp.dependencycheck' ext { pomConfig = { @@ -105,14 +105,14 @@ subprojects { mavenCentral() } - dependencyCheck { - format = 'JSON' - formats = ['JSON'] - junitFailOnCVSS = 7 - failBuildOnCVSS = 7 - } +// dependencyCheck { +// format = 'JSON' +// formats = ['JSON'] +// junitFailOnCVSS = 7 +// failBuildOnCVSS = 7 +// } - check.dependsOn dependencyCheckAggregate +// check.dependsOn dependencyCheckAggregate publishing { publications { diff --git a/sync/vault-sync/vault-sync.gradle b/sync/vault-sync/vault-sync.gradle index 5e90d0e..89513ad 100644 --- a/sync/vault-sync/vault-sync.gradle +++ b/sync/vault-sync/vault-sync.gradle @@ -2,8 +2,8 @@ dependencies { api project(":secrets-manager-api") api project(":vault-commons") implementation "com.google.code.gson:gson:${gsonVersion}" - implementation "com.github.ben-manes.caffeine:caffeine:${cafeineVersion}" - testImplementation("com.squareup.okhttp3:mockwebserver:4.9.3") + implementation "com.github.ben-manes.caffeine:caffeine:${caffeineVersion}" + testImplementation("com.squareup.okhttp3:mockwebserver:${okHttpVersion}") }