From 019a9ba49a7ff623dd3ec5dc6bb6ac6921b3b415 Mon Sep 17 00:00:00 2001
From: Srushti Gangireddy <shrushigangireddy@NLDMIMX3N6D59RJ.local>
Date: Fri, 14 Jun 2024 10:44:35 -0500
Subject: [PATCH] trying to fix spring upgrade

---
 public-api/build.gradle | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/public-api/build.gradle b/public-api/build.gradle
index c13636b8e..9ba66061f 100644
--- a/public-api/build.gradle
+++ b/public-api/build.gradle
@@ -76,11 +76,6 @@ configurations {
     toolsImplementation.extendsFrom implementation
     toolsRuntimeOnly.extendsFrom runtimeOnly
     all*.exclude group: 'javax.annotation', module: 'jsr305'
-
-    all {
-        exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-core'
-        exclude group: 'com.google.code.findbugs', module: 'jsr305'
-    }
 }
 
 ext {
@@ -444,6 +439,20 @@ appengine {
     }
 }
 
+dependencies {
+    testImplementation 'au.com.dius:pact-jvm-consumer-java8:4.0.10'
+    testImplementation 'au.com.dius:pact-jvm-consumer-junit5:4.0.10'
+    modules {
+        module("org.aspectj:aspectjrt") { replacedBy("org.aspectj:aspectjweaver") }
+        module("org.springframework:spring-jcl") { replacedBy("commons-logging:commons-logging") }
+
+        module("org.apache.tomcat:tomcat-juli") {
+            replacedBy("org.apache.tomcat.embed:tomcat-embed-core")
+        }
+    }
+}
+
+
 group = 'org.pmiops.allofus.workbench'
 version = '0.1.0'
 sourceCompatibility = 17