issue_863: updated spring boot, hibernate, and spring retry. Removed …

…an unused dependency.
nsacyber · Nov 27, 2024 · a57cd09 · a57cd09
1 parent e32a9b6
commit a57cd09
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle
@@ -2,22 +2,16 @@ plugins {
     id 'application'
     id 'war'
     id 'com.netflix.nebula.ospackage' version '11.8.0'
-    id 'org.springframework.boot' version '3.0.1'
+    id 'org.springframework.boot' version '3.0.8'
     id 'io.spring.dependency-management' version '1.1.0'
 }
 
 // Get version from main project gradle
-def packVersion = properties.get("packageVersion");
-def jarVersion = properties.get("jarVersion");
-def projVersion = properties.get("projVersion");
+def packVersion = properties.get("packageVersion")
+def jarVersion = properties.get("jarVersion")
+def projVersion = properties.get("projVersion")
 //println "packageVersion is ${projVersion}"
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 bootRun {
     if (project.hasProperty('debug')) {
         jvmArgs project.debug
@@ -36,7 +30,6 @@ dependencies {
     implementation project(':HIRS_AttestationCA')
 
     implementation libs.bouncycastle
-    implementation libs.commons.fileupload
     implementation libs.gson
     implementation libs.guava
     implementation libs.jakarta.persistence.api

diff --git a/gradle/versions.toml b/gradle/versions.toml
@@ -2,14 +2,13 @@
 apacheHttpClientVersion = "4.5.14"
 bouncyCastleVersion = "1.79"
 commonsCodecVersion = "1.17.1"
-commonsFileUploadVersion = "1.5"
 commonsIoVersion = "2.18.0"
 commonsLang3Version = "3.17.0"
 gsonVersion = "2.11.0"
 glassfishJakartaJsonVersion = "2.0.1"
 glassfishJaxbRuntimeVersion = "4.0.5"
 guavaVersion = "33.3.1-jre"
-hibernateCoreVersion = "6.1.7.Final"
+hibernateCoreVersion = "6.2.32.Final"
 jacksonVersion = "2.18.0"
 jakartaPersistenceApiVersion = "3.2.0"
 jakartaServletVersion = "3.0.0"
@@ -22,8 +21,8 @@ minimalJsonVersion = "0.9.5"
 ospackageVersion = "11.2.0"
 pciVersion = "0.3"
 protobufJavaVersion = "4.28.3"
-springBootVersion = "3.0.1"
-springRetryVersion = "2.0.0"
+springBootVersion = "3.0.8"
+springRetryVersion = "2.0.10"
 testngVersion = "7.10.2"
 tomcatVersion = "10.1.33"
 
@@ -41,7 +40,6 @@ spotBugAnnotationVersion = "4.8.6"
 apacheHttpClient = { module = "org.apache.httpcomponents:httpclient", version.ref = "apacheHttpClientVersion" }
 bouncycastle = { module = "org.bouncycastle:bcmail-jdk15to18", version.ref = "bouncyCastleVersion" }
 commons-codec = { module = "commons-codec:commons-codec", version.ref = "commonsCodecVersion" }
-commons-fileupload = { module = "commons-fileupload:commons-fileupload", version.ref = "commonsFileUploadVersion" }
 commons-io = { module = "commons-io:commons-io", version.ref = "commonsIoVersion" }
 commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3Version" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gsonVersion" }