diff --git a/openmetadata-clients/openmetadata-java-client/pom.xml b/openmetadata-clients/openmetadata-java-client/pom.xml index e20fefb3aeb..f6065067a3d 100644 --- a/openmetadata-clients/openmetadata-java-client/pom.xml +++ b/openmetadata-clients/openmetadata-java-client/pom.xml @@ -15,6 +15,7 @@ ${java.version} ${java.version} 2.7.0 + 9.7.0 @@ -37,11 +38,12 @@ org.slf4j slf4j-ext - 2.0.3 + 2.0.6 com.github.joschi.jackson jackson-datatype-threetenbp + 2.6.4 @@ -77,22 +79,22 @@ io.github.openfeign.form feign-form - 2.0.2 + 3.8.0 com.google.auth google-auth-library-oauth2-http - 1.11.0 + 1.14.0 com.microsoft.azure msal4j - 1.13.1 + 1.13.3 io.github.openfeign feign-okhttp - 11.10 + 12.1 org.projectlombok @@ -175,7 +177,7 @@ com.github.jknack handlebars - 4.3.0 + 4.3.1 diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml index 31ca8716cf2..c7588f1847f 100644 --- a/openmetadata-service/pom.xml +++ b/openmetadata-service/pom.xml @@ -16,8 +16,8 @@ ${project.basedir}/target/site/jacoco-aggregate/jacoco.xml ${project.basedir}/src/test/java ${project.basedir}/src/test/java - 1.17.4 - 2.18.1 + 1.17.6 + 2.19.7 0.5.10 @@ -367,7 +367,7 @@ org.eclipse.jetty.websocket websocket-server - 9.4.49.v20220914 + 9.4.50.v20221201 org.springframework diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogGenericExceptionMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogGenericExceptionMapper.java index 7e3c0d9ee87..e18dec951d5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogGenericExceptionMapper.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogGenericExceptionMapper.java @@ -41,7 +41,9 @@ public class CatalogGenericExceptionMapper implements ExceptionMapper @Override public Response toResponse(Throwable ex) { LOG.debug(ex.getMessage()); - if (ex instanceof ProcessingException || ex instanceof IllegalArgumentException) { + if (ex instanceof ProcessingException + || ex instanceof IllegalArgumentException + || ex instanceof javax.ws.rs.BadRequestException) { final Response response = BadRequestException.of().getResponse(); return Response.fromResponse(response) .type(MediaType.APPLICATION_JSON_TYPE) diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java index d8ec7ad3657..e96b23f20c7 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java @@ -15,6 +15,7 @@ package org.openmetadata.service; import static java.lang.String.format; +import io.dropwizard.jersey.jackson.JacksonFeature; import io.dropwizard.testing.ConfigOverride; import io.dropwizard.testing.ResourceHelpers; import io.dropwizard.testing.junit5.DropwizardAppExtension; @@ -24,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.flywaydb.core.Flyway; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.HttpUrlConnectorProvider; +import org.glassfish.jersey.client.JerseyClientBuilder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.openmetadata.service.fernet.Fernet; @@ -69,6 +71,7 @@ public abstract class OpenMetadataApplicationTest { .table("DATABASE_CHANGE_LOG") .locations("filesystem:" + migrationScripsLocation) .sqlMigrationPrefix("v") + .cleanDisabled(false) .load(); flyway.clean(); flyway.migrate(); @@ -102,10 +105,12 @@ public abstract class OpenMetadataApplicationTest { } public static Client getClient() { - return APP.client() + return new JerseyClientBuilder() + .register(new JacksonFeature(APP.getObjectMapper())) .property(ClientProperties.CONNECT_TIMEOUT, 0) .property(ClientProperties.READ_TIMEOUT, 0) - .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true); + .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true) + .build(); } public static WebTarget getResource(String collection) { diff --git a/pom.xml b/pom.xml index 33a3299b26b..c424d61ed15 100644 --- a/pom.xml +++ b/pom.xml @@ -73,14 +73,14 @@ UTF-8 - 4.8.0 + 4.11.0 + 1.7.36 - 2.13.4 - 2.13.4.1 - 2.0.34 + 2.14.1 + 2.14.1 + 2.1.4 1.0 - 2.0.34 - 2.35 + 2.38 2.1.1 3.1.0 @@ -93,27 +93,28 @@ 3.0.2 2.15.0 0.8.8 - 3.34.0 + 3.35.0 1.5.0 2.11.0 - 8.5.11 - 2.1.0.9 - 2.9.1 - 8.0.30 + 9.10.2 + 2.1.0.10 + 2.10 + 8.0.31 42.5.1 1.1.2 2.6 1.18.24 - 10.1.1 + 10.1.4 7.13.4 4.1.5 - 2.2.3 + 2.2.7 1.0.1.RELEASE - 4.5.13 - 5.3.23 + 4.5.14 + + 5.3.24 2.19.0 5.9.1 1.7.2 @@ -133,19 +134,20 @@ false reuseReports 7.6.1 - 2.0.5 - 1.0.73 - 3.19.2 + + 2.0.9 + 1.0.76 + 3.19.3 0.21.2 0.9.1 2.1.6 2.3.31 1.6.2 0.9.0 - 7.5.0 + 7.5.2 1.8.0 2.5.3 - 6.0.6 + 6.0.7 @@ -223,7 +225,7 @@ io.dropwizard dropwizard-jdbi3 - ${dropwizard-jdbi3.version} + ${dropwizard.version} org.jdbi @@ -265,7 +267,7 @@ org.flywaydb flyway-mysql - 9.0.1 + ${flyway.version} org.postgresql @@ -370,7 +372,7 @@ jakarta.xml.bind jakarta.xml.bind-api - 3.0.1 + 4.0.0 @@ -491,7 +493,8 @@ org.eclipse.jetty jetty-io - 9.4.40.v20210413 + + 9.4.50.v20221201 @@ -505,14 +508,14 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.13.3 + 2.14.1 org.yaml snakeyaml - 1.32 + 1.33 @@ -882,4 +885,4 @@ - \ No newline at end of file +