From ce78c75506f71b38cbd2abc3376d1800ce860abd Mon Sep 17 00:00:00 2001
From: TheSilentCoder <184309164+ThatSilentCoder@users.noreply.github.com>
Date: Mon, 25 Nov 2024 08:54:25 -0500
Subject: [PATCH] issue_863: downgraded versions since there was an issue with
 the dependencies versions and the ci/cd pipeline in git. will update each
 depedency slowly to ensure that upgrades are down correctly.

---
 gradle/versions.toml                          | 52 +++++++++----------
 .../main/java/hirs/swid/SwidTagGateway.java   |  8 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/gradle/versions.toml b/gradle/versions.toml
index ac359dd9..77a3be72 100644
--- a/gradle/versions.toml
+++ b/gradle/versions.toml
@@ -1,40 +1,40 @@
 [versions]
-bouncyCastleVersion = "1.78.1"
-commonsCodecVersion = "1.17.1"
+bouncyCastleVersion = "1.77"
+commonsCodecVersion = "1.15"
 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"
+commonsIoVersion = "2.4"
+commonsLang3Version = "3.13.0"
+gsonVersion = "2.10.1"
+glassfishJakartaJsonVersion = "1.1.4"
+glassfishJaxbRuntimeVersion = "2.3.1"
+guavaVersion = "31.1-jre"
+hibernateCoreVersion = "6.1.7.Final"
+jacksonVersion = "2.14.2"
 jakartaPersistenceApiVersion = "3.1.0"
 jakartaServletVersion = "3.0.0"
-jakartaXmlVersion = "4.0.2"
-jcommanderVersion = "2.0"
-log4jVersion = "2.23.1"
+jakartaXmlVersion = "4.0.0"
+jcommanderVersion = "1.83"
+log4jVersion = "2.19.0"
 lombokVersion = "1.18.34"
-mariadbVersion = "3.4.0"
+mariadbVersion = "3.1.4"
 minimalJsonVersion = "0.9.5"
 ospackageVersion = "11.2.0"
 pciVersion = "0.3"
-protobufJavaVersion = "3.25.5"
-springBootVersion = "3.3.4"
+protobufJavaVersion = "3.24.1"
+springBootVersion = "3.0.1"
 springDataJpaDatatablesVersion = "6.0.1"
-springRetryVersion = "2.0.10"
-testngVersion = "7.10.2"
-tomcatVersion = "11.0.1"
+springRetryVersion = "2.0.0"
+testngVersion = "7.4.0"
+tomcatVersion = "10.1.5"
 
 #test dependencies versions
-hamcrestVersion = "3.0"
+hamcrestVersion = "2.2"
 hsqldbVersion = "2.7.3"
-junitJupiterVersion = "5.11.0"
-junitPlatformVersion = "1.11.0"
-mockitoVersion = "5.14.2"
-slf4jVersion = "2.0.16"
-springTestVersion = "6.1.13"
+junitJupiterVersion = "5.9.3"
+junitPlatformVersion = "1.9.3"
+mockitoVersion = "4.2.0"
+slf4jVersion = "1.7.30"
+springTestVersion = "6.0.8"
 spotBugAnnotationVersion = "4.8.6"
 
 [libraries]
@@ -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:jakarta.json", version.ref = "glassfishJakartaJsonVersion" }
+glassfish-jakarta-json = { module = "org.glassfish:javax.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_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
index 2e3e3e25..b3aad0cf 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,10 +9,6 @@ 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;
@@ -21,6 +17,10 @@ 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;