From cb7d68779455cad537710e1fd8bed4a03f6b0405 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:45:04 -0600
Subject: [PATCH] fix(datahub-client): prevent unneeded classes in
 datahub-client jar (#12037)

---
 entity-registry/build.gradle                      |  2 +-
 .../java/datahub-event/build.gradle               |  1 +
 metadata-models/build.gradle                      | 15 +++++++++------
 .../openapi-servlet/models/build.gradle           |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/entity-registry/build.gradle b/entity-registry/build.gradle
index e5baa95967f30..ee5ece4049399 100644
--- a/entity-registry/build.gradle
+++ b/entity-registry/build.gradle
@@ -8,7 +8,7 @@ apply from: "../gradle/coverage/java-coverage.gradle"
 
 dependencies {
   implementation spec.product.pegasus.data
-  implementation spec.product.pegasus.generator
+  compileOnly spec.product.pegasus.generator
   api project(path: ':metadata-models')
   api project(path: ':metadata-models', configuration: "dataTemplate")
   api externalDependency.classGraph
diff --git a/metadata-integration/java/datahub-event/build.gradle b/metadata-integration/java/datahub-event/build.gradle
index 24e119c622936..3dca2eb0a40c9 100644
--- a/metadata-integration/java/datahub-event/build.gradle
+++ b/metadata-integration/java/datahub-event/build.gradle
@@ -18,6 +18,7 @@ dependencies {
   implementation externalDependency.jacksonDataBind
   runtimeOnly externalDependency.jna
 
+  compileOnly externalDependency.swaggerAnnotations
   compileOnly externalDependency.lombok
   annotationProcessor externalDependency.lombok
   // VisibleForTesting
diff --git a/metadata-models/build.gradle b/metadata-models/build.gradle
index e9379163ecaec..2d0b433d69013 100644
--- a/metadata-models/build.gradle
+++ b/metadata-models/build.gradle
@@ -9,12 +9,15 @@ plugins {
 apply from: '../gradle/coverage/java-coverage.gradle'
 
 dependencies {
-  api spec.product.pegasus.data
-    constraints {
-      implementation('org.apache.commons:commons-text:1.10.0') {
-        because 'Vulnerability Issue'
-      }
+  constraints {
+    implementation('org.apache.commons:commons-text:1.10.0') {
+      because 'Vulnerability Issue'
     }
+  }
+
+  api(spec.product.pegasus.data) {
+    exclude group: 'javax.servlet', module: 'javax.servlet-api'
+  }
   api project(':li-utils')
   api project(path: ':li-utils', configuration: "dataTemplate")
   dataModel project(':li-utils')
@@ -26,7 +29,7 @@ dependencies {
 
   compileOnly externalDependency.lombok
   annotationProcessor externalDependency.lombok
-  api externalDependency.swaggerAnnotations
+  compileOnly externalDependency.swaggerAnnotations
   compileOnly externalDependency.jacksonCore
   compileOnly externalDependency.jacksonDataBind
 
diff --git a/metadata-service/openapi-servlet/models/build.gradle b/metadata-service/openapi-servlet/models/build.gradle
index e4100b2d094e0..d75e656e5ecd6 100644
--- a/metadata-service/openapi-servlet/models/build.gradle
+++ b/metadata-service/openapi-servlet/models/build.gradle
@@ -10,6 +10,7 @@ dependencies {
   implementation externalDependency.jacksonDataBind
   implementation externalDependency.httpClient
 
+  compileOnly externalDependency.swaggerAnnotations
   compileOnly externalDependency.lombok
 
   annotationProcessor externalDependency.lombok