diff --git a/buildSrc/src/main/groovy/io.deephaven.repository-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.repository-conventions.gradle index 1deccf352c0..b40cc5f8f9e 100644 --- a/buildSrc/src/main/groovy/io.deephaven.repository-conventions.gradle +++ b/buildSrc/src/main/groovy/io.deephaven.repository-conventions.gradle @@ -13,4 +13,5 @@ repositories { includeGroup 'org.apache.kafka' } } + mavenLocal() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c6b8738dcc9..71902436035 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,7 +50,7 @@ javax-inject = "1" javax-validation = "1.0.0.GA" jdom2 = "2.0.6.1" jetbrains = "24.1.0" -jetty = "12.0.13" +jetty = "12.0.15-SNAPSHOT" jetty11 = "11.0.20" jpy = "0.18.0" jsinterop = "2.0.2" @@ -228,15 +228,13 @@ jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" } jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains" } -jetty-alpn-java-server = { module = "org.eclipse.jetty:jetty-alpn-java-server" } -jetty-alpn-server = { module = "org.eclipse.jetty:jetty-alpn-server" } -jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" } -jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server" } -jetty-ee10-bom = { module = "org.eclipse.jetty.ee10:jetty-ee10-bom", version.ref = "jetty" } -jetty-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp" } -jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet" } -jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets" } -jetty-websocket-jakarta-server = { module = "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server" } +jetty-alpn-java-server = { module = "org.eclipse.jetty:jetty-alpn-java-server", version.ref = "jetty" } +jetty-alpn-server = { module = "org.eclipse.jetty:jetty-alpn-server", version.ref = "jetty" } +jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server", version.ref = "jetty" } +jetty-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp", version.ref = "jetty" } +jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" } +jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "jetty" } +jetty-websocket-jakarta-server = { module = "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server", version.ref = "jetty" } jetty11-alpn-java-server = { module = "org.eclipse.jetty:jetty-alpn-java-server" } jetty11-alpn-server = { module = "org.eclipse.jetty:jetty-alpn-server" } diff --git a/server/jetty/build.gradle b/server/jetty/build.gradle index 33a1f551630..7adf257580b 100644 --- a/server/jetty/build.gradle +++ b/server/jetty/build.gradle @@ -19,8 +19,7 @@ dependencies { testAnnotationProcessor libs.dagger.compiler implementation platform(libs.grpc.bom) - implementation platform(libs.jetty.bom) - implementation platform(libs.jetty.ee10.bom) + implementation platform('io.netty:netty-bom:4.1.100.Final') api libs.jakarata.servlet.api implementation libs.jetty.servlet