issue_898: Merged main

nsacyber · Mar 6, 2025 · 185d798 · 185d798
2 parents 5904c8b + 60cc011
commit 185d798
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/dotnet_provisioner_unit_tests.yml b/.github/workflows/dotnet_provisioner_unit_tests.yml
@@ -134,4 +134,4 @@ jobs:
           if [ -n "$result" ]
           then
               exit 1
-          fi
+          fi
diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle
@@ -4,6 +4,9 @@ plugins {
 }
 
 configurations {
+    all {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+    }
     compileOnly {
         extendsFrom annotationProcessor
     }
@@ -38,23 +41,15 @@ dependencies {
     // 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
-
     compileOnly libs.lombok
     annotationProcessor libs.lombok
 
     compileOnly libs.spotbugs.annotations
     annotationProcessor libs.spotbugs.annotations
 
     testImplementation libs.commons.io
-
-    // 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
@@ -19,10 +19,12 @@ bootRun {
 }
 
 configurations {
+    all {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+    }
     compileOnly {
         extendsFrom annotationProcessor
     }
-    all*.exclude module: 'spring-boot-starter-logging'
 }
 
 dependencies {

diff --git a/HIRS_Structs/build.gradle b/HIRS_Structs/build.gradle
@@ -1,3 +1,9 @@
+configurations {
+    all {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+    }
+}
+
 dependencies {
     implementation libs.commons.lang3
 
@@ -6,9 +12,6 @@ dependencies {
 
     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
@@ -4,6 +4,9 @@ def jarVersion = properties.get("jarVersion")
 //println "packageVersion is ${projVersion}"
 
 configurations {
+    all {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+    }
     compileOnly {
         extendsFrom annotationProcessor
     }
@@ -33,9 +36,6 @@ dependencies {
 
     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
@@ -14,7 +14,6 @@ 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"
@@ -48,7 +47,6 @@ 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" }

diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle
@@ -7,6 +7,12 @@ plugins {
 def packVersion = properties.get("packageVersion");
 def jarVersion = properties.get("jarVersion");
 
+configurations {
+    all {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+    }
+}
+
 dependencies {
     implementation project(':HIRS_Utils')
 
@@ -21,7 +27,6 @@ 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,4 +134,4 @@ jobs: @@
               if [ -n "$result" ]
               then
                   exit 1
-              fi
+              fi