diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle index 91e2fad0..e47c417b 100644 --- a/HIRS_AttestationCA/build.gradle +++ b/HIRS_AttestationCA/build.gradle @@ -26,6 +26,7 @@ dependencies { implementation libs.minimal.json implementation libs.pci + // explicitly include the patched version of the apache http client dependency implementation libs.apacheHttpClient @@ -33,9 +34,12 @@ dependencies { implementation libs.spring.boot.starter.data.jpa implementation libs.spring.retry implementation libs.spring.boot.starter.web + + // explicitly include the patched version of the spring framework webmvc dependency implementation libs.spring.framework.webmvc + // explicitly include the patched version of the logback-core dependency - //implementation libs.logback.classic + implementation libs.logback.classic compileOnly libs.lombok annotationProcessor libs.lombok @@ -44,10 +48,13 @@ dependencies { annotationProcessor libs.spotbugs.annotations testImplementation libs.commons.io - testImplementation libs.spring.boot.starter.test + // explicitly include the patched version of the logback-core dependency testImplementation libs.logback.classic + testImplementation libs.spring.boot.starter.test + + testCompileOnly libs.lombok testAnnotationProcessor libs.lombok } diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle index 18c8a3d0..7d8d60ce 100644 --- a/HIRS_AttestationCAPortal/build.gradle +++ b/HIRS_AttestationCAPortal/build.gradle @@ -37,29 +37,48 @@ dependencies { implementation libs.jakarta.xml implementation libs.pci + // 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 + + // explicitly include the patched version of the spring framework jdbc dependency + implementation libs.spring.framework.jdbc + + // explicitly include the patched version of spring framework expression dependency + implementation libs.spring.framework.expression + + // explicitly include the patched version of the tomcat embed core dependency + implementation libs.tomcat.embed.core + implementation libs.tomcat.embed.jasper - //implementation "org.apache.tomcat.embed:tomcat-embed-core:11.0.0" + + // explicitly include the patched version of the tomcat embed websocket dependency + implementation libs.tomcat.embed.websocket compileOnly libs.lombok annotationProcessor libs.lombok + // explicitly include the patched version of the json path dependency + testImplementation libs.jsonPath + testImplementation libs.hsqldb testImplementation libs.spring.boot.starter.test testCompileOnly libs.lombok testAnnotationProcessor libs.lombok + + // explicitly include the patched version of the xmlunit-core dependency + testImplementation libs.xmlunit.core } test { diff --git a/HIRS_Structs/build.gradle b/HIRS_Structs/build.gradle index ffb949f9..4c69c7ac 100644 --- a/HIRS_Structs/build.gradle +++ b/HIRS_Structs/build.gradle @@ -5,6 +5,7 @@ dependencies { annotationProcessor libs.lombok testImplementation libs.spring.boot.starter.test + // explicitly include the patched version of the logback-core dependency testImplementation libs.logback.classic diff --git a/HIRS_Utils/build.gradle b/HIRS_Utils/build.gradle index a0fe5c75..0f79d21a 100644 --- a/HIRS_Utils/build.gradle +++ b/HIRS_Utils/build.gradle @@ -28,14 +28,14 @@ dependencies { // explicitly include the patched version of the apache http client dependency implementation libs.apacheHttpClient - implementation libs.slf4j.simple - compileOnly libs.lombok 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 6e5d4fec..0e823bf2 100644 --- a/gradle/versions.toml +++ b/gradle/versions.toml @@ -22,14 +22,15 @@ pciVersion = "0.3" protobufJavaVersion = "4.28.3" snakeYamlVersion = "2.0" springBootVersion = "3.4.1" -springCoreVersion = "6.2.1" +springFrameworkVersion = "6.2.1" springRetryVersion = "2.0.10" tomcatVersion = "10.1.34" #test dependencies versions hsqldbVersion = "2.7.3" -slf4jVersion = "2.0.16" +jsonPathVersion = "2.9.0" spotBugAnnotationVersion = "4.8.6" +xmlunitCoreVersion = "2.10.0" [libraries] apacheHttpClient = { module = "org.apache.httpcomponents:httpclient", version.ref = "apacheHttpClientVersion" } @@ -53,20 +54,25 @@ mariadb-java-client = { module = "org.mariadb.jdbc:mariadb-java-client", version 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" } spring-boot-starter-validation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "springBootVersion" } spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "springBootVersion" } -spring-framework-webmvc = { module = "org.springframework:spring-webmvc", version.ref = "springCoreVersion" } +spring-framework-expression = { module = "org.springframework:spring-expression", version.ref = "springFrameworkVersion" } +spring-framework-jdbc = { module = "org.springframework:spring-jdbc", version.ref = "springFrameworkVersion" } +spring-framework-webmvc = { module = "org.springframework:spring-webmvc", version.ref = "springFrameworkVersion" } spring-retry = { module = "org.springframework.retry:spring-retry", version.ref = "springRetryVersion" } +tomcat-embed-core = { module = "org.apache.tomcat.embed:tomcat-embed-core", version.ref = "tomcatVersion" } tomcat-embed-jasper = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version.ref = "tomcatVersion" } +tomcat-embed-websocket = { module = "org.apache.tomcat.embed:tomcat-embed-websocket", version.ref = "tomcatVersion" } + # test dependencies hsqldb = { module = "org.hsqldb:hsqldb", version.ref = "hsqldbVersion" } +jsonPath = { module = "com.jayway.jsonpath:json-path", version.ref = "jsonPathVersion" } spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springBootVersion" } spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotBugAnnotationVersion" } +xmlunit-core = { module = "org.xmlunit:xmlunit-core", version.ref = "xmlunitCoreVersion" } [plugins] \ No newline at end of file