mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.5.x'
Closes gh-28331
This commit is contained in:
commit
191b50241d
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -79,6 +79,9 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
|
|||||||
if (group.equals("org.slf4j") && id.getName().equals("jcl-over-slf4j")) {
|
if (group.equals("org.slf4j") && id.getName().equals("jcl-over-slf4j")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
if (group.startsWith("org.jboss.spec")) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,13 +7,15 @@ description = "Starter for using Undertow as the embedded servlet container. An
|
|||||||
dependencies {
|
dependencies {
|
||||||
api("io.undertow:undertow-core")
|
api("io.undertow:undertow-core")
|
||||||
api("io.undertow:undertow-servlet") {
|
api("io.undertow:undertow-servlet") {
|
||||||
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.2_spec"
|
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
|
||||||
exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_4.0_spec"
|
exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_4.0_spec"
|
||||||
}
|
}
|
||||||
api("io.undertow:undertow-websockets-jsr") {
|
api("io.undertow:undertow-websockets-jsr") {
|
||||||
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.2_spec"
|
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
|
||||||
exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_4.0_spec"
|
exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_4.0_spec"
|
||||||
|
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
|
||||||
}
|
}
|
||||||
api("jakarta.servlet:jakarta.servlet-api")
|
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")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user