From f1899936a01c47660bf322e47433c1bbd101dbc8 Mon Sep 17 00:00:00 2001
From: David Leifker <david.leifker@acryl.io>
Date: Tue, 26 Nov 2024 18:36:11 -0600
Subject: [PATCH] fix(shadowJar): fix shadowJar

---
 .github/workflows/check-datahub-jars.yml                      | 1 +
 .../java/datahub-protobuf/scripts/check_jar.sh                | 4 +++-
 metadata-integration/java/datahub-schematron/lib/build.gradle | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check-datahub-jars.yml b/.github/workflows/check-datahub-jars.yml
index becf8126dc45ba..7a49f32729ec1f 100644
--- a/.github/workflows/check-datahub-jars.yml
+++ b/.github/workflows/check-datahub-jars.yml
@@ -40,4 +40,5 @@ jobs:
       - name: check ${{ matrix.command }} jar
         run: |
           ./gradlew :metadata-integration:java:${{ matrix.command }}:build --info
+          ./gradlew :metadata-integration:java:${{ matrix.command }}:checkShadowJar
           ./gradlew :metadata-integration:java:${{ matrix.command }}:javadoc
diff --git a/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh b/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh
index bd0c28f0f86988..66c70f0b857692 100755
--- a/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh
+++ b/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh
@@ -44,7 +44,9 @@ jar -tvf $jarFile |\
       grep -v "mime.types" |\
       grep -v "com/ibm/.*" |\
       grep -v "org/glassfish/" |\
-      grep -v "LICENSE"
+      grep -v "LICENSE" |\
+      grep -v "org/apache/avro" |\
+      grep -v "org/apache"
 
 if [ $? -ne 0 ]; then
   echo "✅ No unexpected class paths found in ${jarFile}"
diff --git a/metadata-integration/java/datahub-schematron/lib/build.gradle b/metadata-integration/java/datahub-schematron/lib/build.gradle
index 83dec1039f7be0..3ba22ff4cb7b5d 100644
--- a/metadata-integration/java/datahub-schematron/lib/build.gradle
+++ b/metadata-integration/java/datahub-schematron/lib/build.gradle
@@ -45,10 +45,6 @@ jacocoTestReport {
 
 test.finalizedBy jacocoTestReport
 
-task checkShadowJar(type: Exec) {
-   commandLine 'sh', '-c', 'scripts/check_jar.sh'
-}
-
 configurations {
     provided
     implementation.extendsFrom provided