From 4b484293a56cb6f45d1b7d3bd86ac54451294ad6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 03:06:04 +0000 Subject: [PATCH] Fix imports and upgrade dropwizard 3.0.1 to 3.0.2 in logging-dropwizard-3 - @SandorArpa Bump dropwizard.version from 2.1.4 to 2.1.9 Bumps `dropwizard.version` from 2.1.4 to 2.1.9. Updates `io.dropwizard:dropwizard-core` from 2.1.4 to 2.1.9 Updates `io.dropwizard:dropwizard-db` from 2.1.4 to 2.1.9 Updates `io.dropwizard:dropwizard-testing` from 2.1.4 to 2.1.9 --- updated-dependencies: - dependency-name: io.dropwizard:dropwizard-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard:dropwizard-db dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard:dropwizard-testing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- logging-dropwizard-3/pom.xml | 2 +- .../payments/logging/LogstashConsoleAppenderFactory.java | 8 ++++---- .../service/payments/logging/SentryAppenderFactory.java | 8 ++++---- logging/pom.xml | 2 +- queue/pom.xml | 2 +- utils/pom.xml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/logging-dropwizard-3/pom.xml b/logging-dropwizard-3/pom.xml index 229cb932..87eb88bc 100644 --- a/logging-dropwizard-3/pom.xml +++ b/logging-dropwizard-3/pom.xml @@ -8,7 +8,7 @@ jar - 3.0.1 + 3.0.2 2.2 diff --git a/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/LogstashConsoleAppenderFactory.java b/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/LogstashConsoleAppenderFactory.java index de5e7387..d7461cc7 100644 --- a/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/LogstashConsoleAppenderFactory.java +++ b/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/LogstashConsoleAppenderFactory.java @@ -7,10 +7,10 @@ import ch.qos.logback.core.ConsoleAppender; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.gson.Gson; -import io.dropwizard.logging.common.ConsoleAppenderFactory; -import io.dropwizard.logging.common.async.AsyncAppenderFactory; -import io.dropwizard.logging.common.filter.LevelFilterFactory; -import io.dropwizard.logging.common.layout.LayoutFactory; +import io.dropwizard.logging.ConsoleAppenderFactory; +import io.dropwizard.logging.async.AsyncAppenderFactory; +import io.dropwizard.logging.filter.LevelFilterFactory; +import io.dropwizard.logging.layout.LayoutFactory; import net.logstash.logback.encoder.LogstashEncoder; import java.util.Map; diff --git a/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/SentryAppenderFactory.java b/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/SentryAppenderFactory.java index 587f2015..b98b48cb 100644 --- a/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/SentryAppenderFactory.java +++ b/logging-dropwizard-3/src/main/java/uk/gov/service/payments/logging/SentryAppenderFactory.java @@ -27,10 +27,10 @@ imports. Modifications licensed under the MIT License (see LICENCE file). import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.dropwizard.logging.common.AbstractAppenderFactory; -import io.dropwizard.logging.common.async.AsyncAppenderFactory; -import io.dropwizard.logging.common.filter.LevelFilterFactory; -import io.dropwizard.logging.common.layout.LayoutFactory; +import io.dropwizard.logging.AbstractAppenderFactory; +import io.dropwizard.logging.async.AsyncAppenderFactory; +import io.dropwizard.logging.filter.LevelFilterFactory; +import io.dropwizard.logging.layout.LayoutFactory; import io.sentry.Sentry; import io.sentry.SentryOptions; import io.sentry.logback.SentryAppender; diff --git a/logging/pom.xml b/logging/pom.xml index 1ded2547..73b58d79 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - 2.1.4 + 2.1.9 diff --git a/queue/pom.xml b/queue/pom.xml index 28350df2..ef700bf4 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -14,7 +14,7 @@ jar - 2.1.4 + 2.1.9 diff --git a/utils/pom.xml b/utils/pom.xml index 05b07fe3..74e68764 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -14,7 +14,7 @@ jar - 2.1.4 + 2.1.9 2.7.13