From aa04fd943b838bcaf3cabf38ad2380e4c2592a41 Mon Sep 17 00:00:00 2001 From: Saurabh Lodha Date: Thu, 29 Aug 2024 21:50:04 -0400 Subject: [PATCH] Address critical 3PP vulnerabilities --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- build.gradle | 3 +-- carbonj.service/build.gradle | 1 - cc-metrics-reporter/build.gradle | 4 +--- gradle.properties | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 07eb57a1..ae1d6d15 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 1.11 + - name: Set up JDK 1.17 uses: actions/setup-java@v2 with: distribution: 'zulu' @@ -43,4 +43,4 @@ jobs: # with: # image-name: salesforce/carbonj:${{ env.GRADLE_PROJECT_VERSION }} # severity-threshold: CRITICAL - # run-quality-checks: false \ No newline at end of file + # run-quality-checks: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 242f0781..e1062f11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 1.11 + - name: Set up JDK 1.17 uses: actions/setup-java@v2 with: java-version: 17 @@ -27,4 +27,4 @@ jobs: - name: Release with Gradle env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./gradlew -PdockerRepo=salesforce/ clean build -Prelease.useAutomaticVersion=true -x test :carbonj.service:release --info --stacktrace \ No newline at end of file + run: ./gradlew -PdockerRepo=salesforce/ clean build -Prelease.useAutomaticVersion=true -x test :carbonj.service:release --info --stacktrace diff --git a/build.gradle b/build.gradle index e9affe44..6716bea7 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ buildscript { repositories { mavenCentral() mavenLocal() - jcenter() } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springbootVersion}") @@ -68,4 +67,4 @@ subprojects { } -} \ No newline at end of file +} diff --git a/carbonj.service/build.gradle b/carbonj.service/build.gradle index 3456006f..c25a82ba 100644 --- a/carbonj.service/build.gradle +++ b/carbonj.service/build.gradle @@ -81,7 +81,6 @@ ext { repositories { mavenLocal() mavenCentral() - jcenter() } bootJar { diff --git a/cc-metrics-reporter/build.gradle b/cc-metrics-reporter/build.gradle index 5d07c065..c03e16ac 100644 --- a/cc-metrics-reporter/build.gradle +++ b/cc-metrics-reporter/build.gradle @@ -2,7 +2,6 @@ buildscript { repositories { mavenLocal() mavenCentral() - jcenter() } dependencies { classpath 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1' @@ -21,7 +20,6 @@ apply plugin: 'distribution' repositories { mavenLocal() mavenCentral() - jcenter() } @@ -54,4 +52,4 @@ publishing { repositories { mavenLocal() } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 24b6e164..e5955bae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ version=1.1.57-SNAPSHOT org.gradle.jvmargs=--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED org.gradle.daemon=true ccGradlePluginVersion=3.0.3 -springbootVersion=3.0.2 +springbootVersion=3.2.0