Merge branch 'main' into fix/insert_job_perf

Author: collado-mike

.dockerignore

@@ -1,6 +1,6 @@
 *.md
 .*
 Dockerfile
-build
+api/build
 docs
 web/node_modules

Dockerfile

@@ -12,7 +12,7 @@ COPY build.gradle build.gradle
 COPY api ./api
 COPY api/build.gradle ./api/build.gradle
 COPY clients/java ./clients/java
-RUN ./gradlew --no-daemon :api:shadowJar
+RUN ./gradlew --no-daemon clean :api:shadowJar
 
 FROM eclipse-temurin:17
 RUN apt-get update && apt-get install -y postgresql-client bash coreutils

build.gradle

@@ -55,14 +55,14 @@ subprojects {
 
     ext {
         assertjVersion = '3.23.1'
-        dropwizardVersion = '2.1.1'
+        dropwizardVersion = '2.1.2'
         jacocoVersion = '0.8.8'
-        junit5Version = '5.8.2'
+        junit5Version = '5.9.1'
         lombokVersion = '1.18.24'
-        mockitoVersion = '4.5.1'
+        mockitoVersion = '4.8.0'
         openlineageVersion = '0.14.1'
         slf4jVersion = '1.7.36'
-        postgresqlVersion = '42.3.7'
+        postgresqlVersion = '42.5.0'
         isReleaseVersion = !version.endsWith('SNAPSHOT')
     }
 

docker/entrypoint.sh

@@ -12,14 +12,8 @@ if [[ -z "${MARQUEZ_CONFIG}" ]]; then
   echo "WARNING 'MARQUEZ_CONFIG' not set, using development configuration."
 fi
 
-if [[ -z "${MARQUEZ_VERSION}" ]]; then
-  MARQUEZ_VERSION='*'
-  echo "WARNING 'MARQUEZ_VERSION' not set. Running could fail if directory contains multiple jar versions."
-fi
-
-
 # Adjust java options for the http server
 JAVA_OPTS="${JAVA_OPTS} -Duser.timezone=UTC -Dlog4j2.formatMsgNoLookups=true"
 
 # Start http server with java options and configuration
-java ${JAVA_OPTS} -jar marquez-${MARQUEZ_VERSION}.jar server ${MARQUEZ_CONFIG}
+java ${JAVA_OPTS} -jar marquez-*.jar server ${MARQUEZ_CONFIG}