Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Servlet 6.0 and related EE 10 specs

Browse Source 
Co-authored-by: Phillip Webb <pwebb@vmware.com>

Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
This commit is contained in:
Andy Wilkinson
2022-11-05 17:57:18 -07:00
parent 1525ed9170
commit b67c427259
36 changed files with 188 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle
View File

@@ -27,9 +27,26 @@ repositories {
}
configurations {
jetty
tomcat
undertow
app {
extendsFrom(configurations.runtimeClasspath)
}
jetty {
extendsFrom(app)
}
tomcat {
extendsFrom(app)
}
undertow {
extendsFrom(app)
}
}
dependencyManagement {
jetty {
dependencies {
dependency "jakarta.servlet:jakarta.servlet-api:5.0.0"
}
}
}
tasks.register("resourcesJar", Jar) { jar ->
@@ -50,30 +67,30 @@ tasks.register("resourcesJar", Jar) { jar ->
dependencies {
compileOnly("org.eclipse.jetty:jetty-server")
compileOnly("org.springframework:spring-web")
implementation("org.springframework.boot:spring-boot-starter")
implementation("org.springframework:spring-web")
app(files(resourcesJar))
app(files(sourceSets.main.output))
app("org.springframework:spring-web")
jetty("org.springframework.boot:spring-boot-starter-jetty")
jetty files(resourcesJar)
tomcat("org.springframework.boot:spring-boot-starter-tomcat")
tomcat files(resourcesJar)
undertow("org.springframework.boot:spring-boot-starter-undertow")
undertow files(resourcesJar)
}
def boolean isWindows() {
return File.separatorChar == '\\';
}
["jetty", "tomcat", "undertow"].each { container ->
["jetty", "tomcat", "undertow"].each { webServer ->
def configurer = { task ->
task.dependsOn resourcesJar
task.mainClass = "com.example.ResourceHandlingApplication"
task.classpath = sourceSets.main.runtimeClasspath.plus(configurations.getByName(container))
task.classifier = container
task.classpath = configurations.getByName(webServer)
task.classifier = webServer
task.targetJavaVersion = project.getTargetCompatibility()
}
tasks.register("${container}BootJar", BootJar, configurer)
tasks.register("${container}BootWar", BootWar, configurer)
tasks.register("${webServer}BootJar", BootJar, configurer)
tasks.register("${webServer}BootWar", BootWar, configurer)
}