mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
This commit is contained in:
parent
7c56a45d3e
commit
3405a54f9e
@ -78,6 +78,9 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
|
|||||||
if (group.equals("org.codehaus.groovy")) {
|
if (group.equals("org.codehaus.groovy")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
if (group.equals("org.eclipse.jetty.toolchain")) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (group.startsWith("javax")) {
|
if (group.startsWith("javax")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ dependencies {
|
|||||||
optional("org.cache2k:cache2k-micrometer")
|
optional("org.cache2k:cache2k-micrometer")
|
||||||
optional("org.cache2k:cache2k-spring")
|
optional("org.cache2k:cache2k-spring")
|
||||||
optional("org.eclipse.jetty:jetty-server") {
|
optional("org.eclipse.jetty:jetty-server") {
|
||||||
exclude group: "javax.servlet", module: "javax.servlet-api"
|
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
|
||||||
}
|
}
|
||||||
optional("org.elasticsearch:elasticsearch")
|
optional("org.elasticsearch:elasticsearch")
|
||||||
optional("org.elasticsearch.client:elasticsearch-rest-client") {
|
optional("org.elasticsearch.client:elasticsearch-rest-client") {
|
||||||
@ -166,7 +166,7 @@ dependencies {
|
|||||||
testImplementation("org.awaitility:awaitility")
|
testImplementation("org.awaitility:awaitility")
|
||||||
testImplementation("org.cache2k:cache2k-api")
|
testImplementation("org.cache2k:cache2k-api")
|
||||||
testImplementation("org.eclipse.jetty:jetty-webapp") {
|
testImplementation("org.eclipse.jetty:jetty-webapp") {
|
||||||
exclude group: "javax.servlet", module: "javax.servlet-api"
|
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
|
||||||
}
|
}
|
||||||
testImplementation("org.elasticsearch.client:elasticsearch-rest-high-level-client") {
|
testImplementation("org.elasticsearch.client:elasticsearch-rest-high-level-client") {
|
||||||
exclude(group: "commons-logging", module: "commons-logging")
|
exclude(group: "commons-logging", module: "commons-logging")
|
||||||
|
@ -41,7 +41,7 @@ dependencies {
|
|||||||
optional("org.cache2k:cache2k-micrometer")
|
optional("org.cache2k:cache2k-micrometer")
|
||||||
optional("org.cache2k:cache2k-spring")
|
optional("org.cache2k:cache2k-spring")
|
||||||
optional("org.eclipse.jetty:jetty-server") {
|
optional("org.eclipse.jetty:jetty-server") {
|
||||||
exclude(group: "javax.servlet", module: "javax.servlet-api")
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
optional("org.elasticsearch:elasticsearch")
|
optional("org.elasticsearch:elasticsearch")
|
||||||
optional("org.elasticsearch.client:elasticsearch-rest-client") {
|
optional("org.elasticsearch.client:elasticsearch-rest-client") {
|
||||||
|
@ -75,15 +75,18 @@ dependencies {
|
|||||||
optional("org.aspectj:aspectjweaver")
|
optional("org.aspectj:aspectjweaver")
|
||||||
optional("org.cache2k:cache2k-spring")
|
optional("org.cache2k:cache2k-spring")
|
||||||
optional("org.eclipse.jetty:jetty-webapp") {
|
optional("org.eclipse.jetty:jetty-webapp") {
|
||||||
exclude group: "javax.servlet", module: "javax.servlet-api"
|
|
||||||
exclude(group: "org.eclipse.jetty", module: "jetty-jndi")
|
exclude(group: "org.eclipse.jetty", module: "jetty-jndi")
|
||||||
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
optional("org.eclipse.jetty:jetty-reactive-httpclient")
|
optional("org.eclipse.jetty:jetty-reactive-httpclient")
|
||||||
optional("org.eclipse.jetty.websocket:websocket-jakarta-server") {
|
optional("org.eclipse.jetty.websocket:websocket-jakarta-server") {
|
||||||
exclude(group: "org.eclipse.jetty", module: "jetty-jndi")
|
exclude(group: "org.eclipse.jetty", module: "jetty-jndi")
|
||||||
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-websocket-api")
|
||||||
}
|
}
|
||||||
optional("org.eclipse.jetty.websocket:websocket-jetty-server") {
|
optional("org.eclipse.jetty.websocket:websocket-jetty-server") {
|
||||||
exclude(group: "org.eclipse.jetty", module: "jetty-jndi")
|
exclude(group: "org.eclipse.jetty", module: "jetty-jndi")
|
||||||
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
optional("org.ehcache:ehcache") {
|
optional("org.ehcache:ehcache") {
|
||||||
artifact {
|
artifact {
|
||||||
|
@ -66,7 +66,9 @@ dependencies {
|
|||||||
testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
|
testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
|
||||||
testImplementation("org.assertj:assertj-core")
|
testImplementation("org.assertj:assertj-core")
|
||||||
testImplementation("org.awaitility:awaitility")
|
testImplementation("org.awaitility:awaitility")
|
||||||
testImplementation("org.eclipse.jetty.websocket:websocket-jakarta-client")
|
testImplementation("org.eclipse.jetty.websocket:websocket-jakarta-client") {
|
||||||
|
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-websocket-api"
|
||||||
|
}
|
||||||
testImplementation("org.hamcrest:hamcrest-library")
|
testImplementation("org.hamcrest:hamcrest-library")
|
||||||
testImplementation("org.hsqldb:hsqldb")
|
testImplementation("org.hsqldb:hsqldb")
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter")
|
testImplementation("org.junit.jupiter:junit-jupiter")
|
||||||
|
@ -5,11 +5,19 @@ plugins {
|
|||||||
description = "Starter for using Jetty as the embedded servlet container. An alternative to spring-boot-starter-tomcat"
|
description = "Starter for using Jetty as the embedded servlet container. An alternative to spring-boot-starter-tomcat"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
api("jakarta.servlet:jakarta.servlet-api")
|
||||||
|
api("jakarta.websocket:jakarta.websocket-api")
|
||||||
api("org.apache.tomcat.embed:tomcat-embed-el")
|
api("org.apache.tomcat.embed:tomcat-embed-el")
|
||||||
api("org.eclipse.jetty:jetty-servlets")
|
api("org.eclipse.jetty:jetty-servlets")
|
||||||
api("org.eclipse.jetty:jetty-webapp")
|
api("org.eclipse.jetty:jetty-webapp") {
|
||||||
api("org.eclipse.jetty.websocket:websocket-jakarta-server")
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
|
}
|
||||||
|
api("org.eclipse.jetty.websocket:websocket-jakarta-server") {
|
||||||
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-websocket-api")
|
||||||
|
}
|
||||||
api("org.eclipse.jetty.websocket:websocket-jetty-server") {
|
api("org.eclipse.jetty.websocket:websocket-jetty-server") {
|
||||||
exclude group: "org.eclipse.jetty", module: "jetty-jndi"
|
exclude group: "org.eclipse.jetty", module: "jetty-jndi"
|
||||||
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -62,13 +62,13 @@ dependencies {
|
|||||||
optional("org.eclipse.jetty:jetty-servlets")
|
optional("org.eclipse.jetty:jetty-servlets")
|
||||||
optional("org.eclipse.jetty:jetty-util")
|
optional("org.eclipse.jetty:jetty-util")
|
||||||
optional("org.eclipse.jetty:jetty-webapp") {
|
optional("org.eclipse.jetty:jetty-webapp") {
|
||||||
exclude(group: "javax.servlet", module: "javax.servlet-api")
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
optional("org.eclipse.jetty:jetty-alpn-conscrypt-server") {
|
optional("org.eclipse.jetty:jetty-alpn-conscrypt-server") {
|
||||||
exclude(group: "javax.servlet", module: "javax.servlet-api")
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
optional("org.eclipse.jetty.http2:http2-server") {
|
optional("org.eclipse.jetty.http2:http2-server") {
|
||||||
exclude(group: "javax.servlet", module: "javax.servlet-api")
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
optional("org.flywaydb:flyway-core")
|
optional("org.flywaydb:flyway-core")
|
||||||
optional("org.hamcrest:hamcrest-library")
|
optional("org.hamcrest:hamcrest-library")
|
||||||
|
@ -12,7 +12,6 @@ configurations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("jakarta.servlet:jakarta.servlet-api")
|
|
||||||
compileOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jetty"))
|
compileOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jetty"))
|
||||||
|
|
||||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) {
|
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) {
|
||||||
@ -20,8 +19,8 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
providedRuntime("org.eclipse.jetty:apache-jsp") {
|
providedRuntime("org.eclipse.jetty:apache-jsp") {
|
||||||
exclude group: "javax.annotation", module: "javax.annotation-api"
|
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
|
||||||
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
|
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-schemas"
|
||||||
}
|
}
|
||||||
|
|
||||||
runtimeOnly("org.glassfish.web:jakarta.servlet.jsp.jstl")
|
runtimeOnly("org.glassfish.web:jakarta.servlet.jsp.jstl")
|
||||||
|
Loading…
Reference in New Issue
Block a user