issue_863: finished updating dependency versions. Ready for PR

HIRS_AttestationCA/build.gradle

@@ -28,40 +28,41 @@ dependencies {
     implementation project(':HIRS_Structs')
 
 
-    implementation libs.spring.data.jpa.datatables
-    implementation libs.spring.boot.starter.data.jpa
-    implementation libs.spring.retry
-    implementation libs.spring.boot.starter.web
-
     implementation libs.bouncycastle
     implementation libs.commons.codec
+    implementation libs.commons.io
     implementation libs.commons.lang3
-    implementation libs.jakarta.persistence.api
-    implementation libs.jakarta.xml
     implementation libs.hibernate.core
-    implementation libs.pci
     implementation libs.guava
     implementation libs.jackson.core
     implementation libs.jackson.databind
-    implementation libs.minimal.json
-    implementation libs.protobuf.java
+    implementation libs.jakarta.persistence.api
+    implementation libs.jakarta.xml
     implementation libs.log4j.api
     implementation libs.log4j.core
+    implementation libs.minimal.json
+    implementation libs.pci
+    implementation libs.protobuf.java
+    implementation libs.spring.data.jpa.datatables
+    implementation libs.spring.boot.starter.data.jpa
+    implementation libs.spring.retry
+    implementation libs.spring.boot.starter.web
 
-    testImplementation libs.apache.commons.io
+    compileOnly libs.lombok
+    annotationProcessor libs.lombok
+
+    compileOnly libs.spotbugs.annotations
+    annotationProcessor libs.spotbugs.annotations
+
+    testImplementation libs.commons.io
     testImplementation libs.hamcrest
     testImplementation libs.junit.jupiter
     testImplementation libs.junit.platform.launcher
     testImplementation libs.mockito.core
     testImplementation libs.spring.test
 
-    compileOnly libs.spotbugs.annotations
-    annotationProcessor libs.spotbugs.annotations
-
-    // spring management
-    compileOnly libs.lombok
-    implementation libs.lombok
-    annotationProcessor libs.lombok
+    testCompileOnly libs.lombok
+    testAnnotationProcessor libs.lombok
 }
 checkstyle {
     toolVersion = '10.12.7'

HIRS_AttestationCAPortal/build.gradle

@@ -42,33 +42,33 @@ dependencies {
     implementation project(':HIRS_Utils')
     implementation project(':HIRS_AttestationCA')
 
-    implementation libs.pci
-    implementation libs.gson
     implementation libs.bouncycastle
+    implementation libs.commons.fileupload
+    implementation libs.gson
     implementation libs.guava
-    implementation libs.jakarta.servlet
     implementation libs.jakarta.persistence.api
+    implementation libs.jakarta.servlet
     implementation libs.jakarta.xml
-
-    //implementation libs.
-
+    implementation libs.log4j.spring.boot
+    implementation libs.mariadb.java.client
+    implementation libs.pci
     implementation libs.spring.boot.starter.web
     implementation libs.spring.boot.starter.validation
     implementation libs.spring.boot.starter.data.jpa
     implementation libs.spring.boot.starter.log4j2
-    implementation libs.log4j.spring.boot
-    implementation libs.lombok
-    implementation libs.commons.fileupload
     implementation libs.tomcat.embed.jasper
 
     compileOnly libs.lombok
-    implementation libs.mariadb.java.client
     annotationProcessor libs.lombok
+
     providedRuntime libs.spring.boot.starter.tomcat
 
-    testImplementation libs.spring.boot.starter.test
     testImplementation libs.junit.jupiter
     testImplementation libs.hsqldb
+    testImplementation libs.spring.boot.starter.test
+
+    testCompileOnly libs.lombok
+    testAnnotationProcessor libs.lombok
 }
 
 checkstyle {

HIRS_Structs/build.gradle

@@ -18,10 +18,16 @@ repositories {
 dependencies {
     implementation libs.commons.lang3
 
+    compileOnly libs.lombok
+    annotationProcessor libs.lombok
+
 //    testCompile libs.mockito
     testImplementation libs.junit.jupiter
     testImplementation libs.junit.platform.launcher
     testImplementation libs.hamcrest
+
+    testCompileOnly libs.lombok
+    testAnnotationProcessor libs.lombok
 }
 
 test {

HIRS_Utils/build.gradle

@@ -28,31 +28,32 @@ configurations {
 
 dependencies {
     implementation libs.bouncycastle
-    implementation libs.lombok
+    implementation libs.commons.codec
+    implementation libs.commons.lang3
+    implementation libs.commons.io
+    implementation libs.glassfish.jaxb.runtime
+    implementation libs.guava
     implementation libs.jackson.core
     implementation libs.jackson.databind
     implementation libs.jakarta.persistence.api
     implementation libs.jakarta.xml
-    implementation libs.guava
-    implementation libs.commons.codec
-    implementation libs.commons.lang3
-    implementation libs.commons.io
-    implementation libs.minimal.json
-    implementation libs.pci
-
     implementation libs.log4j.core
     implementation libs.log4j.api
-    implementation libs.glassfish.jaxb.runtime
+    implementation libs.minimal.json
+    implementation libs.pci
     implementation libs.slf4j.simple
 
+    compileOnly libs.lombok
+    annotationProcessor libs.lombok
+
     testImplementation libs.junit.jupiter
     testImplementation libs.junit.platform.launcher
     testImplementation libs.hamcrest
     testImplementation libs.mockito.core
     testImplementation project(path: ':HIRS_AttestationCA')
-
-    compileOnly libs.lombok
-    annotationProcessor libs.lombok
+    
+    testCompileOnly libs.lombok
+    testAnnotationProcessor libs.lombok
 }
 
 checkstyle {

gradle/versions.toml

@@ -1,57 +1,56 @@
 [versions]
-bouncyCastleVersion = "1.77"
-commonsCodecVersion = "1.15"
-commonsFileuploadVersion = "1.5"
-commonsIoVersion = "2.11.0"
-commonsLang3Version = "3.13.0"
-gsonVersion = "2.10.1"
-glassfishJsonVersion = "1.1.4"
-glassfishJaxbRuntimeVersion = "2.3.1"
-guavaVersion = "31.1-jre"
-hibernateCoreVersion = "6.1.7.Final"
-jacksonVersion = "2.14.2"
-jakartaApiVersion = "3.1.0"
+bouncyCastleVersion = "1.78.1"
+commonsCodecVersion = "1.17.1"
+commonsFileUploadVersion = "1.5"
+commonsIoVersion = "2.17.0"
+commonsLang3Version = "3.17.0"
+gsonVersion = "2.11.0"
+glassfishJakartaJsonVersion = "2.0.1"
+glassfishJaxbRuntimeVersion = "4.0.5"
+guavaVersion = "33.3.0-jre"
+hibernateCoreVersion = "6.5.2.Final"
+jacksonVersion = "2.17.2"
+jakartaPersistenceApiVersion = "3.1.0"
 jakartaServletVersion = "3.0.0"
-jakartaXmlVersion = "4.0.0"
-jcommanderVersion = "1.83"
-log4jVersion = "2.19.0"
-lombokVersion = "1.18.26"
-mariadbVersion = "3.1.4"
+jakartaXmlVersion = "4.0.2"
+jcommanderVersion = "2.0"
+log4jVersion = "2.23.1"
+lombokVersion = "1.18.34"
+mariadbVersion = "3.4.0"
 minimalJsonVersion = "0.9.5"
 ospackageVersion = "11.2.0"
 pciVersion = "0.3"
-protobufJavaVersion = "3.24.1"
-springBootVersion = "3.0.1"
+protobufJavaVersion = "3.25.5"
+springBootVersion = "3.3.4"
 springDataJpaDatatablesVersion = "6.0.1"
-springRetryVersion = "2.0.0"
-testngVersion = "7.4.0"
-tomcatVersion = "10.1.5"
+springRetryVersion = "2.0.10"
+testngVersion = "7.10.2"
+tomcatVersion = "11.0.1"
 
 #test dependencies versions
-apacheCommonsVersion = "2.4"
-hamcrestVersion = "2.2"
-hsqldbVersion = "2.7.2"
-junitJupiterVersion = "5.9.3"
-junitPlatformVersion = "1.9.3"
-mockitoVersion = "4.2.0"
-slf4jVersion = "1.7.30"
-springTestVersion = "6.0.8"
+hamcrestVersion = "3.0"
+hsqldbVersion = "2.7.3"
+junitJupiterVersion = "5.11.0"
+junitPlatformVersion = "1.11.0"
+mockitoVersion = "5.14.2"
+slf4jVersion = "2.0.16"
+springTestVersion = "6.1.13"
 spotBugAnnotationVersion = "4.8.6"
 
 [libraries]
 bouncycastle = { module = "org.bouncycastle:bcmail-jdk18on", version.ref = "bouncyCastleVersion" }
 commons-codec = { module = "commons-codec:commons-codec", version.ref = "commonsCodecVersion" }
-commons-fileupload = { module = "commons-fileupload:commons-fileupload", version.ref = "commonsFileuploadVersion" }
+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" }
-glassfish-javax-json = { module = "org.glassfish:javax.json", version.ref = "glassfishJsonVersion" }
+glassfish-jakarta-json = { module = "org.glassfish:jakarta.json", version.ref = "glassfishJakartaJsonVersion" }
 glassfish-jaxb-runtime = { module = "org.glassfish.jaxb:jaxb-runtime", version.ref = "glassfishJaxbRuntimeVersion" }
 guava = { module = "com.google.guava:guava", version.ref = "guavaVersion" }
 hibernate-core = { module = "org.hibernate:hibernate-core", version.ref = "hibernateCoreVersion" }
 jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jacksonVersion" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jacksonVersion" }
-jakarta-persistence-api = { module = "jakarta.persistence:jakarta.persistence-api", version.ref = "jakartaApiVersion" }
+jakarta-persistence-api = { module = "jakarta.persistence:jakarta.persistence-api", version.ref = "jakartaPersistenceApiVersion" }
 jakarta-servlet = { module = "org.glassfish.web:jakarta.servlet.jsp.jstl", version.ref = "jakartaServletVersion" }
 jakarta-xml = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jakartaXmlVersion" }
 jcommander = { module = "org.jcommander:jcommander", version.ref = "jcommanderVersion" }
@@ -76,12 +75,13 @@ tomcat-embed-jasper = { module = "org.apache.tomcat.embed:tomcat-embed-jasper",
 testng = { module = "org.testng:testng", version.ref = "testngVersion" }
 
 # test dependencies
-apache-commons-io = { module = "org.apache.directory.studio:org.apache.commons.io", version.ref = "apacheCommonsVersion" }
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrestVersion" }
 hsqldb = { module = "org.hsqldb:hsqldb", version.ref = "hsqldbVersion" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junitJupiterVersion" }
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatformVersion" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoVersion" }
 spring-test = { module = "org.springframework:spring-test", version.ref = "springTestVersion" }
 spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springBootVersion" }
-spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotBugAnnotationVersion" }
+spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotBugAnnotationVersion" }
+
+[plugins]