Skip to content

Commit d872af8

Browse files
committed
Re-add java compilation source compatibility as Java 8 for servlet jakarta.
1 parent 4070038 commit d872af8

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ hdrhistogram = "org.hdrhistogram:HdrHistogram:2.2.2"
5454
# 6.0.0+ use java.lang.Deprecated forRemoval and since from Java 9
5555
jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:5.0.0"
5656
# Using javax.annotation is fine as it is part of the JDK, we don't want to depend on J2EE
57-
# where it is relocated to as org.apache.tomcat:tomcat-annotations-api. See issue #7179.
57+
# where it is relocated to as org.apache.tomcat:tomcat-annotations-api. See issue #9179.
5858
javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
5959
javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
6060
# 12.0.0+ require Java 17+

servlet/jakarta/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ configurations {
3737
undertowTestImplementation.extendsFrom(itImplementation)
3838
}
3939

40+
java {
41+
sourceCompatibility = JavaVersion.VERSION_1_8
42+
targetCompatibility = JavaVersion.VERSION_1_8
43+
}
44+
4045
// Mechanically transform sources from grpc-servlet to use the corrected packages
4146
def migrate(String name, String inputDir, SourceSet sourceSet) {
4247
def outputDir = layout.buildDirectory.dir('generated/sources/jakarta-' + name)

0 commit comments

Comments
 (0)