From d831d021232690d3f6302144352c6f6f797f8145 Mon Sep 17 00:00:00 2001
From: TheSilentCoder <184309164+ThatSilentCoder@users.noreply.github.com>
Date: Tue, 26 Nov 2024 14:37:57 -0500
Subject: [PATCH] issue_863: upgrading this slowly but surely again. testing to
 see if github's ci/cd is happy still with these set of changes.

---
 HIRS_AttestationCA/build.gradle               |  7 -----
 HIRS_AttestationCAPortal/build.gradle         |  1 -
 HIRS_Structs/build.gradle                     | 12 --------
 HIRS_Utils/build.gradle                       | 10 -------
 build.gradle                                  | 16 ++++++++--
 gradle.properties                             |  5 ++--
 gradle/versions.toml                          | 30 +++++++++----------
 tools/tcg_eventlog_tool/build.gradle          |  7 -----
 tools/tcg_rim_tool/build.gradle               |  7 -----
 .../main/java/hirs/swid/SwidTagGateway.java   |  8 ++---
 10 files changed, 36 insertions(+), 67 deletions(-)

diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle
index d3f24d91..7fbcbdea 100644
--- a/HIRS_AttestationCA/build.gradle
+++ b/HIRS_AttestationCA/build.gradle
@@ -1,15 +1,8 @@
 plugins {
-    id 'java'
     id 'io.spring.dependency-management' version '1.1.0'
     id 'com.google.protobuf' version '0.9.4'
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 repositories {
     mavenCentral()
 
diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle
index bec8a53c..914afa26 100644
--- a/HIRS_AttestationCAPortal/build.gradle
+++ b/HIRS_AttestationCAPortal/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'application'
-    id 'java'
     id 'war'
     id 'com.netflix.nebula.ospackage' version '11.8.0'
     id 'org.springframework.boot' version '3.0.6'
diff --git a/HIRS_Structs/build.gradle b/HIRS_Structs/build.gradle
index 42c44c25..25795719 100644
--- a/HIRS_Structs/build.gradle
+++ b/HIRS_Structs/build.gradle
@@ -1,13 +1,3 @@
-plugins {
-    id 'java'
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 repositories {
     mavenCentral()
 
@@ -41,5 +31,3 @@ test {
 //        }
 //    }
 //}
-
-
diff --git a/HIRS_Utils/build.gradle b/HIRS_Utils/build.gradle
index f51a8c78..8e3aae77 100644
--- a/HIRS_Utils/build.gradle
+++ b/HIRS_Utils/build.gradle
@@ -1,18 +1,8 @@
-plugins {
-    id 'java'
-}
 // Get version from main project gradle
 def packVersion = properties.get("packageVersion")
 def jarVersion = properties.get("jarVersion")
 //println "packageVersion is ${projVersion}"
 
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 repositories {
     mavenCentral()
     flatDir { dirs "lib" }
diff --git a/build.gradle b/build.gradle
index 86138e28..f554b504 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,13 @@
+import com.github.spotbugs.snom.SpotBugsTask
+
 import java.util.concurrent.TimeUnit
 
 plugins {
     // Apply the application plugin to add support for building a CLI application in Java.
     id 'application'
-    id 'com.github.spotbugs' version '6.0.4'
+    id 'com.github.spotbugs' version '6.0.4' apply false
     id 'checkstyle'
+    id 'java'
 }
 
 // Global checkstyle file
@@ -12,6 +15,14 @@ ext.checkstyleConfigFile = new File(rootDir, "/config/checkstyle/sun_checks.xml"
 
 subprojects {
     apply plugin: "com.github.spotbugs"
+    apply plugin: "java"
+    apply plugin: "checkstyle"
+
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
 
     checkstyle {
         toolVersion = '10.20.0'
@@ -24,6 +35,7 @@ subprojects {
     checkstyleTest {
         source = 'src/test/java'
     }
+
     tasks.withType(Checkstyle).configureEach {
         reports {
             xml.required = false
@@ -35,7 +47,7 @@ subprojects {
         excludeFilter = file('config/spotbugs/spotbugs-exclude.xml')
     }
 
-    tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
+    tasks.withType(SpotBugsTask).configureEach {
         reports {
             html.required = true
         }
diff --git a/gradle.properties b/gradle.properties
index b79ec6e0..066b32fe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,6 @@
 excludeGroups=rhel-6,performance
 includeGroups=
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms512m -Xmx2048m
-org.gradle.caching=true
\ No newline at end of file
+org.gradle.jvmargs=-Xms1g -Xmx4g
+org.gradle.caching=true
+org.gradle.parallel=true
\ No newline at end of file
diff --git a/gradle/versions.toml b/gradle/versions.toml
index f616dc6f..b4a34f49 100644
--- a/gradle/versions.toml
+++ b/gradle/versions.toml
@@ -3,29 +3,29 @@ bouncyCastleVersion = "1.79"
 commonsCodecVersion = "1.17.1"
 commonsFileUploadVersion = "1.5"
 commonsIoVersion = "2.18.0"
-commonsLang3Version = "3.16.0"
-gsonVersion = "2.10.1"
-glassfishJakartaJsonVersion = "1.1.4"
-glassfishJaxbRuntimeVersion = "2.3.1"
-guavaVersion = "31.1-jre"
+commonsLang3Version = "3.17.0"
+gsonVersion = "2.11.0"
+glassfishJakartaJsonVersion = "2.0.1"
+glassfishJaxbRuntimeVersion = "4.0.5"
+guavaVersion = "33.3.0-jre"
 hibernateCoreVersion = "6.1.7.Final"
-jacksonVersion = "2.14.2"
-jakartaPersistenceApiVersion = "3.1.0"
-jakartaServletVersion = "3.0.0"
-jakartaXmlVersion = "4.0.0"
-jcommanderVersion = "1.83"
+jacksonVersion = "2.17.2"
+jakartaPersistenceApiVersion = "3.2.0"
+jakartaServletVersion = "3.0.1"
+jakartaXmlVersion = "4.0.2"
+jcommanderVersion = "2.0"
 log4jVersion = "2.24.2"
 lombokVersion = "1.18.34"
-mariadbVersion = "3.1.4"
+mariadbVersion = "3.4.0"
 minimalJsonVersion = "0.9.5"
 ospackageVersion = "11.2.0"
 pciVersion = "0.3"
-protobufJavaVersion = "3.24.1"
+protobufJavaVersion = "3.25.5"
 springBootVersion = "3.0.1"
 springDataJpaDatatablesVersion = "6.0.1"
 springRetryVersion = "2.0.0"
-testngVersion = "7.4.0"
-tomcatVersion = "10.1.5"
+testngVersion = "7.10.2"
+tomcatVersion = "11.0.1"
 
 #test dependencies versions
 hamcrestVersion = "3.0"
@@ -44,7 +44,7 @@ commons-fileupload = { module = "commons-fileupload:commons-fileupload", version
 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-jakarta-json = { module = "org.glassfish:javax.json", version.ref = "glassfishJakartaJsonVersion" }
+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" }
diff --git a/tools/tcg_eventlog_tool/build.gradle b/tools/tcg_eventlog_tool/build.gradle
index 2e535eb0..cc664763 100644
--- a/tools/tcg_eventlog_tool/build.gradle
+++ b/tools/tcg_eventlog_tool/build.gradle
@@ -1,17 +1,10 @@
 plugins {
-    id "java"
     id "com.netflix.nebula.ospackage" version "11.4.0"
 }
 // Get version from main project gradle
 def packVersion = properties.get("packageVersion");
 def jarVersion = properties.get("jarVersion");
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 repositories {
     mavenCentral()
     flatDir { dirs "lib" }
diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle
index 97eed621..af335903 100644
--- a/tools/tcg_rim_tool/build.gradle
+++ b/tools/tcg_rim_tool/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id "java"
     id 'com.netflix.nebula.ospackage' version '11.4.0'
     id 'com.intershop.gradle.jaxb' version '5.1.0'
 }
@@ -8,12 +7,6 @@ plugins {
 def packVersion = properties.get("packageVersion");
 def jarVersion = properties.get("jarVersion");
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 repositories {
     mavenCentral()
     flatDir { dirs "lib" }
diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
index b3aad0cf..2e3e3e25 100644
--- a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
+++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
@@ -9,6 +9,10 @@ import hirs.utils.xjc.ObjectFactory;
 import hirs.utils.xjc.ResourceCollection;
 import hirs.utils.xjc.SoftwareIdentity;
 import hirs.utils.xjc.SoftwareMeta;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.JAXBException;
@@ -17,10 +21,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
 import javax.xml.crypto.MarshalException;
 import javax.xml.crypto.XMLStructure;
 import javax.xml.crypto.dom.DOMStructure;