ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-19 21:17:59 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

issue_863: upgrading this slowly but surely again. testing to see if github's ci/cd is happy still with these set of changes (again)

Browse Source
This commit is contained in:
TheSilentCoder 2024-11-26 14:57:32 -05:00
parent d831d02123
commit fea59607f0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle/versions.toml
View File

@ -5,8 +5,8 @@ commonsFileUploadVersion = "1.5"
commonsIoVersion = "2.18.0"
commonsLang3Version = "3.17.0"
gsonVersion = "2.11.0"
glassfishJakartaJsonVersion = "2.0.1"
glassfishJaxbRuntimeVersion = "4.0.5"
glassfishJakartaJsonVersion = "1.1.4"
glassfishJaxbRuntimeVersion = "2.3.1"
guavaVersion = "33.3.0-jre"
hibernateCoreVersion = "6.1.7.Final"
jacksonVersion = "2.17.2"
@ -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" }

8
tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
View File

@ -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;