Update build files and configuration for Dropwizard 4.0.13 upgrade

Signed-off-by: swar00pduthks <[email protected]>

Author: swar00pduthks

Dockerfile

@@ -4,9 +4,13 @@
 FROM eclipse-temurin:17 AS base
 WORKDIR /usr/src/app
 COPY gradle gradle
+RUN ls -la gradle
 COPY gradle.properties gradle.properties
+RUN ls -la gradle.properties
 COPY gradlew gradlew
+RUN ls -la gradlew
 COPY settings.gradle settings.gradle
+RUN ls -la settings.gradle
 
 # Make wrapper executable and fix line endings
 RUN chmod +x ./gradlew
@@ -15,16 +19,25 @@ RUN sed -i 's/\r$//' ./gradlew
 FROM base AS build
 WORKDIR /usr/src/app
 COPY build.gradle build.gradle
+RUN ls -la build.gradle
 COPY api ./api
+RUN ls -la api
 COPY clients/java ./clients/java
-RUN ./gradlew --no-daemon clean :api:shadowJar
+RUN ls -la clients/java
+RUN ./gradlew clean :api:shadowJar --no-daemon --refresh-dependencies
 
 FROM eclipse-temurin:17
-RUN apt-get update && apt-get install -y postgresql-client bash coreutils
+RUN apt-get update && apt-get install -y postgresql-client bash coreutils dos2unix
 WORKDIR /usr/src/app
 COPY --from=build /usr/src/app/api/build/libs/marquez-*.jar /usr/src/app
+RUN ls -la /usr/src/app/marquez-*.jar
 COPY marquez.dev.yml marquez.dev.yml
+RUN ls -la marquez.dev.yml
 COPY docker/entrypoint.sh entrypoint.sh
-RUN chmod +x entrypoint.sh
+RUN dos2unix entrypoint.sh && \
+    chmod +x entrypoint.sh && \
+    ls -la entrypoint.sh && \
+    cat entrypoint.sh
+
 EXPOSE 5000 5001
-ENTRYPOINT ["/usr/src/app/entrypoint.sh"]
+CMD ["/usr/src/app/entrypoint.sh"]

api/build.gradle

@@ -28,7 +28,11 @@ ext {
     testcontainersVersion = '1.18.3'
     sentryVersion = '6.34.0'
 }
-
+configurations.all {
+    resolutionStrategy {
+        force 'com.google.guava:guava:32.1.3-jre'
+    }
+}
 dependencies {
     implementation project(':clients:java')
     implementation "io.dropwizard:dropwizard-core:${dropwizardVersion}"
@@ -54,9 +58,15 @@ dependencies {
     implementation 'org.glassfish:jakarta.el:4.0.2'
 
     // GraphQL dependencies with Jakarta EE 9 support
-    implementation "com.graphql-java:graphql-java:${graphqlJavaVersion}"
-    implementation "com.graphql-java-kickstart:graphql-java-servlet:${graphqlServletVersion}"
-    implementation "com.graphql-java-kickstart:graphql-java-kickstart:${graphqlServletVersion}"
+    implementation ("com.graphql-java:graphql-java:${graphqlJavaVersion}") {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    implementation ("com.graphql-java-kickstart:graphql-java-servlet:${graphqlServletVersion}") {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    implementation ("com.graphql-java-kickstart:graphql-java-kickstart:${graphqlServletVersion}") {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
 
     implementation "io.prometheus:simpleclient_servlet_jakarta:0.16.0"
     implementation "io.prometheus:simpleclient_common:0.16.0"
@@ -74,6 +84,7 @@ dependencies {
     implementation 'org.flywaydb:flyway-core:8.5.13'
     implementation "org.postgresql:postgresql:${postgresqlVersion}"
     implementation "io.openlineage:openlineage-java:0.30.1"
+    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     implementation 'org.opensearch.client:opensearch-rest-client:2.19.1'
     implementation 'org.opensearch.client:opensearch-java:2.22.0'
@@ -86,7 +97,6 @@ dependencies {
     testImplementation "org.junit.vintage:junit-vintage-engine:${junit5Version}"
     testImplementation "org.testcontainers:postgresql:${testcontainersVersion}"
     testImplementation "org.testcontainers:junit-jupiter:${testcontainersVersion}"
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junit5Version}"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit5Version}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junit5Version}"
@@ -205,12 +215,22 @@ shadowJar {
         include 'LICENSE'
     }
     mergeServiceFiles()
+    // Include all dependencies by default
+    exclude 'io/dropwizard/logback/shaded/guava/**'
+    exclude 'META-INF/maven/com.google.guava/**' // Optional: only if you want zero guava metadata
+
     dependencies {
-        include(dependency('jakarta.platform:jakarta.jakartaee-api'))
-        include(dependency('jakarta.platform:jakarta.jakartaee-bom'))
-        include(dependency('jakarta.annotation:jakarta.annotation-api'))
-        include(dependency('jakarta.validation:jakarta.validation-api'))
-        include(dependency('io.dropwizard:dropwizard-jdbi3'))
+          exclude { dep ->
+            dep.moduleGroup == 'com.google.guava' &&
+            (dep.moduleName == 'guava' && dep.moduleVersion == '31.0.1-jre')
+        }
+        //exclude(dependency('com.google.guava:guava')) 
+        // Exclude test dependencies
+        exclude(dependency('org.junit:.*'))
+        exclude(dependency('org.testcontainers:.*'))
+        exclude(dependency('org.junit.jupiter:.*'))
+        exclude(dependency('org.junit.vintage:.*'))
+        exclude(dependency('com.google.guava:guava:31.0.1-jre'))
     }
     manifest {
         attributes(

build.gradle

@@ -38,6 +38,12 @@ allprojects {
         maven {
             url "https://repo.eclipse.org/content/groups/releases/"
         }
+
+        configurations.all {
+        resolutionStrategy {
+            force 'com.google.guava:guava:33.4.6-jre'
+        }
+    }
     }
 }
 
@@ -76,6 +82,12 @@ subprojects {
         prometheusVersion = '0.16.0'
     }
 
+    configurations.all {
+        resolutionStrategy {
+            force 'com.google.guava:guava:32.1.3-jre'
+        }
+    }
+
     dependencies {
         implementation platform("jakarta.platform:jakarta.jakartaee-bom:${jakartaVersion}")
         implementation "jakarta.platform:jakarta.jakartaee-api:${jakartaVersion}"

config.yml

@@ -0,0 +1,40 @@
+server:
+  applicationConnectors:
+    - type: http
+      port: ${MARQUEZ_PORT:-5000}
+      httpCompliance: RFC7230_LEGACY
+  adminConnectors:
+    - type: http
+      port: ${MARQUEZ_ADMIN_PORT:-5001}
+
+db:
+  driverClass: org.postgresql.Driver
+  url: jdbc:postgresql://postgres:5432/marquez
+  user: marquez
+  password: marquez
+
+migrateOnStartup: true
+
+graphql:
+  enabled: true
+
+logging:
+  level: DEBUG
+  appenders:
+    - type: console
+  loggers:
+    marquez.db: DEBUG
+    marquez.service: DEBUG
+    marquez: DEBUG
+    org.eclipse.jetty: INFO
+    org.jdbi: DEBUG
+    org.postgresql: DEBUG
+
+search:
+  enabled: false
+
+tags:
+  - name: PII
+    description: Personally identifiable information
+  - name: SENSITIVE
+    description: Contains sensitive information