From 1b9df78238402ae4c06eeed12313c2144b7bca69 Mon Sep 17 00:00:00 2001 From: TheSilentCoder <184309164+ThatSilentCoder@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:40:26 -0500 Subject: [PATCH] issue_863: Fixed some critical dependencies in all of the modules except for HIRS_CA and HIRS_CAportal modules. --- HIRS_AttestationCA/build.gradle | 7 +++++-- HIRS_AttestationCAPortal/build.gradle | 9 +++++---- HIRS_Structs/build.gradle | 2 ++ HIRS_Utils/build.gradle | 5 +++-- gradle/versions.toml | 10 +++++++--- tools/tcg_rim_tool/build.gradle | 1 + 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle index 860f33ad..91e2fad0 100644 --- a/HIRS_AttestationCA/build.gradle +++ b/HIRS_AttestationCA/build.gradle @@ -25,9 +25,8 @@ dependencies { implementation libs.spring.boot.starter.log4j2 implementation libs.minimal.json - // pull the pci dependency and ... implementation libs.pci - // and explicitly include the patched version of the apache http client dependency + // explicitly include the patched version of the apache http client dependency implementation libs.apacheHttpClient implementation libs.protobuf.java @@ -35,6 +34,8 @@ dependencies { implementation libs.spring.retry implementation libs.spring.boot.starter.web implementation libs.spring.framework.webmvc + // explicitly include the patched version of the logback-core dependency + //implementation libs.logback.classic compileOnly libs.lombok annotationProcessor libs.lombok @@ -44,6 +45,8 @@ dependencies { testImplementation libs.commons.io testImplementation libs.spring.boot.starter.test + // explicitly include the patched version of the logback-core dependency + testImplementation libs.logback.classic testCompileOnly libs.lombok testAnnotationProcessor libs.lombok diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle index 7de8a5dd..18c8a3d0 100644 --- a/HIRS_AttestationCAPortal/build.gradle +++ b/HIRS_AttestationCAPortal/build.gradle @@ -36,24 +36,25 @@ dependencies { implementation libs.jakarta.servlet implementation libs.jakarta.xml - // pull the pci dependency and ... implementation libs.pci - // and explicitly include the patched version of the apache http client dependency + // explicitly include the patched version of the apache http client dependency implementation libs.apacheHttpClient implementation libs.mariadb.java.client implementation libs.spring.boot.starter.web + // explicitly include the patched version of the snake yaml dependency + implementation libs.snake.yaml //implementation libs.spring.framework.webmvc + //implementation libs.logback.classic implementation libs.spring.boot.starter.validation implementation libs.spring.boot.starter.data.jpa implementation libs.spring.boot.starter.log4j2 implementation libs.tomcat.embed.jasper + //implementation "org.apache.tomcat.embed:tomcat-embed-core:11.0.0" compileOnly libs.lombok annotationProcessor libs.lombok - providedRuntime libs.spring.boot.starter.tomcat - testImplementation libs.hsqldb testImplementation libs.spring.boot.starter.test diff --git a/HIRS_Structs/build.gradle b/HIRS_Structs/build.gradle index c870d64a..ffb949f9 100644 --- a/HIRS_Structs/build.gradle +++ b/HIRS_Structs/build.gradle @@ -5,6 +5,8 @@ dependencies { annotationProcessor libs.lombok testImplementation libs.spring.boot.starter.test + // explicitly include the patched version of the logback-core dependency + testImplementation libs.logback.classic testCompileOnly libs.lombok testAnnotationProcessor libs.lombok diff --git a/HIRS_Utils/build.gradle b/HIRS_Utils/build.gradle index 24471b82..a0fe5c75 100644 --- a/HIRS_Utils/build.gradle +++ b/HIRS_Utils/build.gradle @@ -24,9 +24,8 @@ dependencies { implementation libs.spring.boot.starter.log4j2 implementation libs.minimal.json - // pull the pci dependency and ... implementation libs.pci - // and explicitly include the patched version of the apache http client dependency + // explicitly include the patched version of the apache http client dependency implementation libs.apacheHttpClient implementation libs.slf4j.simple @@ -35,6 +34,8 @@ dependencies { annotationProcessor libs.lombok testImplementation libs.spring.boot.starter.test + // explicitly include the patched version of the logback-core dependency + testImplementation libs.logback.classic testImplementation project(path: ':HIRS_AttestationCA') testCompileOnly libs.lombok diff --git a/gradle/versions.toml b/gradle/versions.toml index 3c67dc0c..6e5d4fec 100644 --- a/gradle/versions.toml +++ b/gradle/versions.toml @@ -7,22 +7,24 @@ commonsLang3Version = "3.17.0" gsonVersion = "2.11.0" glassfishJakartaJsonVersion = "2.0.1" glassfishJaxbRuntimeVersion = "4.0.5" -guavaVersion = "33.3.1-jre" +guavaVersion = "33.4.0-jre" jacksonVersion = "2.18.2" jakartaPersistenceApiVersion = "3.2.0" jakartaServletVersion = "3.0.0" jakartaXmlVersion = "4.0.2" jcommanderVersion = "2.0" lombokVersion = "1.18.36" +logbackClassicVersion = "1.5.13" mariadbVersion = "3.5.1" minimalJsonVersion = "0.9.5" ospackageVersion = "11.2.0" pciVersion = "0.3" protobufJavaVersion = "4.28.3" -springBootVersion = "3.4.0" +snakeYamlVersion = "2.0" +springBootVersion = "3.4.1" springCoreVersion = "6.2.1" springRetryVersion = "2.0.10" -tomcatVersion = "10.1.33" +tomcatVersion = "10.1.34" #test dependencies versions hsqldbVersion = "2.7.3" @@ -45,12 +47,14 @@ jakarta-persistence-api = { module = "jakarta.persistence:jakarta.persistence-ap 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" } +logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackClassicVersion" } lombok = { module = "org.projectlombok:lombok", version.ref = "lombokVersion" } mariadb-java-client = { module = "org.mariadb.jdbc:mariadb-java-client", version.ref = "mariadbVersion" } minimal-json = { module = "com.eclipsesource.minimal-json:minimal-json", version.ref = "minimalJsonVersion" } pci = { module = "com.github.marandus:pci-ids", version.ref = "pciVersion" } protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobufJavaVersion" } slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4jVersion" } +snake-yaml = { module = "org.yaml:snakeyaml", version.ref = "snakeYamlVersion" } spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa", version.ref = "springBootVersion" } spring-boot-starter-log4j2 = { module = "org.springframework.boot:spring-boot-starter-log4j2", version.ref = "springBootVersion" } spring-boot-starter-tomcat = { module = "org.springframework.boot:spring-boot-starter-tomcat", version.ref = "springBootVersion" } diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle index 820c55ee..4c63d0a7 100644 --- a/tools/tcg_rim_tool/build.gradle +++ b/tools/tcg_rim_tool/build.gradle @@ -21,6 +21,7 @@ dependencies { implementation libs.jakarta.xml implementation libs.spring.boot.starter.log4j2 implementation libs.spring.boot.starter.data.jpa + implementation libs.logback.classic compileOnly libs.lombok annotationProcessor libs.lombok