diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 51b49430b..c2bdc1f3e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,6 +26,9 @@ updates: - dependency-name: "tools.jackson.core:jackson-databind" # this dependency monitors convergence conflicts, so we pin a specific version - dependency-name: "com.squareup.okio:okio-jvm" + # https://github.com/jetty/jetty.project/issues/15657 + - dependency-name: "org.eclipse.jetty:*" + versions: ["<=12.1.12"] groups: minor-java-dependencies: diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 74b51abab..6ceb9feb0 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -10,10 +10,6 @@ 4.0.0 integration-tests - - 12.1.12 - - org.whispersystems.textsecure @@ -39,7 +35,6 @@ org.eclipse.jetty.http2 jetty-http2-client-transport - ${jetty.http2-client.version} diff --git a/pom.xml b/pom.xml index 9258bb7da..19af54361 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,7 @@ 4.5.14 2.22.2 1.0.0 + 12.1.9 2.3.0 3.0.2 2.4.10 @@ -109,6 +110,7 @@ + com.fasterxml.jackson jackson-bom @@ -116,6 +118,22 @@ pom import + + + org.eclipse.jetty + jetty-bom + ${jetty.version} + pom + import + + + + org.eclipse.jetty.ee10 + jetty-ee10-bom + ${jetty.version} + pom + import + io.netty netty-bom diff --git a/service/pom.xml b/service/pom.xml index 9ce5c463f..782acd56c 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -23,7 +23,6 @@ 2.30.0-alpha 5.2.0 0.31.9.RELEASE - 12.1.12 @@ -147,7 +146,6 @@ org.eclipse.jetty.http2 jetty-http2-client-transport test - ${jetty.http2-client.version} io.dropwizard