chore(): global tomcat exclude (#13698)

This commit is contained in:
david-leifker 2025-06-06 17:38:24 -05:00 committed by GitHub
parent 79e8da01e2
commit ab5b08e725
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 13 additions and 27 deletions

View File

@ -397,6 +397,9 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage')}) {
exclude group: "org.codehaus.jackson", module: "jackson-mapper-asl" exclude group: "org.codehaus.jackson", module: "jackson-mapper-asl"
exclude group: "javax.mail", module: "mail" exclude group: "javax.mail", module: "mail"
exclude group: 'org.glassfish', module: 'javax.json' exclude group: 'org.glassfish', module: 'javax.json'
// Tomcat excluded for jetty
exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el'
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
resolutionStrategy.force externalDependency.antlr4Runtime resolutionStrategy.force externalDependency.antlr4Runtime
resolutionStrategy.force externalDependency.antlr4 resolutionStrategy.force externalDependency.antlr4

View File

@ -14,12 +14,8 @@ dependencies {
implementation externalDependency.opentelemetrySdkMetrics implementation externalDependency.opentelemetrySdkMetrics
implementation externalDependency.slf4jApi implementation externalDependency.slf4jApi
implementation(externalDependency.springBootStarterJetty) { implementation(externalDependency.springBootStarterJetty)
exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el' implementation(externalDependency.springBootStarterValidation)
}
implementation(externalDependency.springBootStarterValidation) {
exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el'
}
compileOnly externalDependency.lombok compileOnly externalDependency.lombok
annotationProcessor externalDependency.lombok annotationProcessor externalDependency.lombok

View File

@ -17,12 +17,8 @@ dependencies {
// TODO: Extract PE consumer into separate pod. // TODO: Extract PE consumer into separate pod.
implementation project(':metadata-jobs:pe-consumer') implementation project(':metadata-jobs:pe-consumer')
implementation(externalDependency.springBootStarterWeb) { implementation(externalDependency.springBootStarterWeb)
exclude module: "spring-boot-starter-tomcat" implementation(externalDependency.springBootStarterJetty)
}
implementation(externalDependency.springBootStarterJetty) {
exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el'
}
implementation externalDependency.springKafka implementation externalDependency.springKafka
implementation externalDependency.springBootAutoconfigure implementation externalDependency.springBootAutoconfigure
implementation externalDependency.springActuator implementation externalDependency.springActuator

View File

@ -18,12 +18,8 @@ dependencies {
implementation project(':entity-registry') implementation project(':entity-registry')
implementation project(':metadata-jobs:common') implementation project(':metadata-jobs:common')
implementation(externalDependency.springBootStarterWeb) { implementation(externalDependency.springBootStarterWeb)
exclude module: "spring-boot-starter-tomcat" implementation(externalDependency.springBootStarterJetty)
}
implementation(externalDependency.springBootStarterJetty) {
exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el'
}
implementation externalDependency.springKafka implementation externalDependency.springKafka
implementation externalDependency.springBootAutoconfigure implementation externalDependency.springBootAutoconfigure
implementation externalDependency.springActuator implementation externalDependency.springActuator

View File

@ -40,4 +40,5 @@ dependencies {
testImplementation externalDependency.jacksonCore testImplementation externalDependency.jacksonCore
testImplementation externalDependency.jacksonDataBind testImplementation externalDependency.jacksonDataBind
testImplementation externalDependency.springBootStarterWeb testImplementation externalDependency.springBootStarterWeb
testImplementation externalDependency.springBootStarterJetty
} }

View File

@ -35,15 +35,9 @@ dependencies {
runtimeOnly externalDependency.mysqlConnector runtimeOnly externalDependency.mysqlConnector
runtimeOnly externalDependency.postgresql runtimeOnly externalDependency.postgresql
implementation(externalDependency.springBootStarterWeb) { implementation(externalDependency.springBootStarterWeb)
exclude module: "spring-boot-starter-tomcat" implementation(externalDependency.springBootStarterJetty)
} implementation(externalDependency.springBootStarterValidation)
implementation(externalDependency.springBootStarterJetty) {
exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el'
}
implementation(externalDependency.springBootStarterValidation) {
exclude group: 'org.apache.tomcat.embed', module: 'tomcat-embed-el'
}
implementation externalDependency.jettyJmx implementation externalDependency.jettyJmx
implementation externalDependency.springWebMVC implementation externalDependency.springWebMVC