Address critical 3PP vulnerabilities

salesforce · Aug 30, 2024 · 7c51b6f · 7c51b6f
1 parent c84e217
commit 7c51b6f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git 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
+        # run-quality-checks: false
diff --git 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
+      run: ./gradlew  -PdockerRepo=salesforce/ clean build -Prelease.useAutomaticVersion=true -x test :carbonj.service:release --info --stacktrace
diff --git 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 {
     }
 
 
-}
+}
diff --git a/carbonj.service/build.gradle b/carbonj.service/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath "org.springframework.boot:spring-boot-gradle-plugin:${springbootVersion}"
         classpath 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1'
-        classpath 'net.researchgate:gradle-release:2.8.1'
+        classpath 'net.researchgate:gradle-release:3.0.2'
         classpath 'com.netflix.nebula:gradle-ospackage-plugin:8.6.3'
     }
 }
@@ -81,7 +81,6 @@ ext {
 repositories {
     mavenLocal()
     mavenCentral()
-    jcenter()
 }
 
 bootJar {

diff --git 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()
     }
-}
+}
diff --git 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