-
Notifications
You must be signed in to change notification settings - Fork 19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Expose org.eclipse.jetty:jetty-servlet in bom. #651
Conversation
gradle/libs.versions.toml
Outdated
@@ -48,7 +49,7 @@ kotlin-reflect = { module = 'org.jetbrains.kotlin:kotlin-reflect' } | |||
|
|||
tomcat-embed-core = { module = 'org.apache.tomcat.embed:tomcat-embed-core', version.ref = 'tomcat' } | |||
undertow-servlet = { module = 'io.undertow:undertow-servlet', version.ref = 'undertow' } | |||
jetty = { module = 'org.eclipse.jetty:jetty-servlet', version.ref = 'jetty' } | |||
managed-jetty = { module = 'org.eclipse.jetty:jetty-servlet', version.ref = 'managed-jetty' } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to make this managed?
In the other linked PRs to this one, it's jetty-server
not jetty-servlet
So could we just expose the version?
I don't know
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually...thinking about it, I'm wrong... There's no way in aws to hava a catalog entry for jetty-server with the version from here... |
@sdelamo @wetted How's this 44d2cf5 So here we expose a version and a BOM for jetty... We can then (in AWS for example) change the libs.versions.toml thusly: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cdc245337..0ce4aa60c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,6 @@ spock = "2.3-groovy-4.0"
bouncycastle = '1.70'
fileupload = '0.0.6'
-jetty = '11.0.20'
logback-json-classic = '0.1.5'
micronaut-discovery = "4.2.0"
@@ -88,7 +87,7 @@ bouncycastle-provider = { module = 'org.bouncycastle:bcprov-jdk15on', version.re
fileupload = { module = 'org.javadelight:delight-fileupload', version.ref = 'fileupload' }
graal-sdk = { module = 'org.graalvm.sdk:graal-sdk', version.ref = 'graal' }
jackson-afterburner = { module = 'com.fasterxml.jackson.module:jackson-module-afterburner' }
-jetty-server = { module = 'org.eclipse.jetty:jetty-server', version.ref = 'jetty' }
+jetty-server = { module = 'org.eclipse.jetty:jetty-server' }
jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' }
junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine' }
junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api' } (so we don't declare a Jetty version in there), and then we would need to update the build files with platform dependencies diff --git a/function-aws-api-proxy-test/build.gradle.kts b/function-aws-api-proxy-test/build.gradle.kts
index 05ef65887..1432c7bef 100644
--- a/function-aws-api-proxy-test/build.gradle.kts
+++ b/function-aws-api-proxy-test/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
dependencies {
api(mn.micronaut.http.server)
api(projects.micronautFunctionAwsApiProxy)
+ implementation(platform(mnServlet.boms.jetty))
implementation(libs.jetty.server)
testImplementation(mn.micronaut.http.client)
testImplementation(mn.micronaut.jackson.databind) I think this is where we wanted to end up? |
|
No description provided.