From 301689ddb6cde346bd2dd53f1e471e23f33c372d Mon Sep 17 00:00:00 2001
From: TheSilentCoder <184309164+ThatSilentCoder@users.noreply.github.com>
Date: Wed, 27 Nov 2024 16:53:35 -0500
Subject: [PATCH] issue_863: reverted changes from last commit. let's see if
 that makes a difference

---
 HIRS_AttestationCAPortal/build.gradle | 9 ++++++---
 build.gradle                          | 8 ++------
 gradle/versions.toml                  | 2 ++
 tools/tcg_rim_tool/build.gradle       | 2 ++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle
index 47529409..03e8190c 100644
--- a/HIRS_AttestationCAPortal/build.gradle
+++ b/HIRS_AttestationCAPortal/build.gradle
@@ -30,8 +30,10 @@ dependencies {
     implementation project(':HIRS_AttestationCA')
 
     implementation libs.bouncycastle
+    implementation libs.guava
     implementation libs.gson
     implementation libs.jakarta.persistence.api
+    implementation libs.jakarta.servlet
     implementation libs.jakarta.xml
     implementation libs.log4j.spring.boot
 
@@ -43,24 +45,25 @@ dependencies {
     // with the non-vulnerable version of the apache http client dependency
     implementation libs.apacheHttpClient
 
+    implementation libs.mariadb.java.client
     implementation libs.spring.boot.starter.web
     implementation libs.spring.boot.starter.validation
     implementation libs.spring.boot.starter.data.jpa
-    runtimeOnly libs.tomcat.embed.jasper
+    implementation libs.spring.boot.starter.log4j2
+    implementation libs.tomcat.embed.jasper
 
     compileOnly libs.lombok
     annotationProcessor libs.lombok
 
     providedRuntime libs.spring.boot.starter.tomcat
-    runtimeOnly libs.mariadb.java.client
 
     testImplementation libs.junit.jupiter
+    testImplementation libs.hsqldb
     testImplementation libs.spring.boot.starter.test
 
     testCompileOnly libs.lombok
     testAnnotationProcessor libs.lombok
 
-    testRuntimeOnly libs.hsqldb
 }
 
 test {
diff --git a/build.gradle b/build.gradle
index 9c2150e4..258a2b9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,10 @@
-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.autonomousapps.dependency-analysis' version "2.5.0"
     id 'checkstyle'
-    id 'com.github.spotbugs' version "6.0.4" apply false
+    id 'com.github.spotbugs' version '6.0.4' apply false
     id 'java'
 }
 
@@ -15,7 +12,6 @@ plugins {
 ext.checkstyleConfigFile = new File(rootDir, "/config/checkstyle/sun_checks.xml")
 
 subprojects {
-    apply plugin: 'com.autonomousapps.dependency-analysis'
     apply plugin: "com.github.spotbugs"
     apply plugin: "java"
     apply plugin: "checkstyle"
@@ -54,7 +50,7 @@ subprojects {
         excludeFilter = file('config/spotbugs/spotbugs-exclude.xml')
     }
 
-    tasks.withType(SpotBugsTask).configureEach {
+    tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
         reports {
             html.required = true
         }
diff --git a/gradle/versions.toml b/gradle/versions.toml
index f4e668b7..4a2f203c 100644
--- a/gradle/versions.toml
+++ b/gradle/versions.toml
@@ -11,6 +11,7 @@ guavaVersion = "33.3.1-jre"
 hibernateCoreVersion = "6.2.32.Final"
 jacksonVersion = "2.18.0"
 jakartaPersistenceApiVersion = "3.2.0"
+jakartaServletVersion = "3.0.0"
 jakartaXmlVersion = "4.0.2"
 jcommanderVersion = "1.85"
 log4jVersion = "2.24.2"
@@ -49,6 +50,7 @@ hibernate-core = { module = "org.hibernate:hibernate-core", version.ref = "hiber
 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 = "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" }
 log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4jVersion" }
diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle
index d41567b4..9a1ac809 100644
--- a/tools/tcg_rim_tool/build.gradle
+++ b/tools/tcg_rim_tool/build.gradle
@@ -10,10 +10,12 @@ def jarVersion = properties.get("jarVersion");
 dependencies {
     implementation project(':HIRS_Utils')
 
+
     implementation libs.bouncycastle
     implementation libs.commons.codec
     implementation libs.glassfish.jakarta.json
     implementation libs.glassfish.jaxb.runtime
+    implementation libs.guava
     implementation libs.hibernate.core
     implementation libs.jcommander
     implementation libs.jackson.databind