Only compile and run Jetty test if Java 17.

Author: kannanjgithub

gradle/libs.versions.toml

@@ -19,10 +19,10 @@ androidx-test-ext-junit = "androidx.test.ext:junit:1.2.1"
 androidx-test-rules = "androidx.test:rules:1.6.1"
 animalsniffer = "org.codehaus.mojo:animal-sniffer:1.24"
 animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.24"
-assertj-core = "org.assertj:assertj-core:3.27.2"
+assertj-core = "org.assertj:assertj-core:3.27.3"
 auto-value = "com.google.auto.value:auto-value:1.11.0"
 auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.11.0"
-checkstyle = "com.puppycrawl.tools:checkstyle:10.21.1"
+checkstyle = "com.puppycrawl.tools:checkstyle:10.21.2"
 commons-math3 = "org.apache.commons:commons-math3:3.6.1"
 conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
 cronet-api = "org.chromium.net:cronet-api:119.6045.31"
@@ -34,13 +34,14 @@ cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
 errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.30.0"
 # error-prone 2.32.0+ require Java 17+
 errorprone-core = "com.google.errorprone:error_prone_core:2.31.0"
-google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.50.1"
+google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.51.0"
 # google-auth-library 1.25.0+ requires error_prone_annotations 2.31.0+, which
 # breaks the Android build
 google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.24.1"
 google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.24.1"
 # Release notes: https://cloud.google.com/logging/docs/release-notes
-google-cloud-logging = "com.google.cloud:google-cloud-logging:3.21.1"
+google-cloud-logging = "com.google.cloud:google-cloud-logging:3.21.2"
+# 2.12.1 requires error_prone_annotations:2.36.0 but we are stuck with 2.30.0
 gson = "com.google.code.gson:gson:2.11.0"
 # 33.4.0 requires com.google.errorprone:error_prone_annotations:2.36.0 but we are stuck with 2.30.0 (see above)
 guava = "com.google.guava:guava:33.3.1-android"
@@ -64,8 +65,7 @@ jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.0.16"
 jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.20"
 jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.16"
 jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.20"
-# 4.9.0+ requires Java 11.
-jsr305 = "com.github.spotbugs:spotbugs-annotations:4.8.6"
+jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
 junit = "junit:junit:4.13.2"
 # 2.17+ require Java 11+ (not mentioned in release notes)
 lincheck = "org.jetbrains.kotlinx:lincheck-jvm:2.16"

servlet/jakarta/build.gradle

@@ -8,13 +8,15 @@ description = "gRPC: Jakarta Servlet"
 // Set up classpaths and source directories for different servlet tests
 sourceSets {
 
-    // Only run these tests if java 11+ is being used
-    if (JavaVersion.current().isJava11Compatible()) {
+    // Only run these tests if the required minimum Java version is being used
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
         jettyTest {
             java {
                 include '**/Jetty*.java'
             }
         }
+    }
+    if (JavaVersion.current().isJava11Compatible()) {
         tomcatTest {
             java {
                 include '**/Tomcat*.java'
@@ -59,9 +61,11 @@ def migrate(String name, String inputDir, SourceSet sourceSet) {
 
 migrate('main', '../src/main/java', sourceSets.main)
 
-// Only build sourceSets and classpaths for tests if using Java 11
-if (JavaVersion.current().isJava11Compatible()) {
+// Only build sourceSets and classpaths for tests if using the required minimum Java version
+if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
     migrate('jettyTest', '../src/jettyTest/java', sourceSets.jettyTest)
+}
+if (JavaVersion.current().isJava11Compatible()) {
     migrate('tomcatTest', '../src/tomcatTest/java', sourceSets.tomcatTest)
     migrate('undertowTest', '../src/undertowTest/java', sourceSets.undertowTest)
 }
@@ -106,12 +110,16 @@ dependencies {
 
 // Set up individual classpaths for each test, to avoid any mismatch,
 // and ensure they are only used when supported by the current jvm
-if (JavaVersion.current().isJava11Compatible()) {
+if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
     def jetty11Test = tasks.register('jetty11Test', Test) {
         classpath = sourceSets.jettyTest.runtimeClasspath
         testClassesDirs = sourceSets.jettyTest.output.classesDirs
     }
-
+    tasks.named("check").configure {
+        dependsOn jetty11Test
+    }
+}
+if (JavaVersion.current().isJava11Compatible()) {
     def tomcat10Test = tasks.register('tomcat10Test', Test) {
         classpath = sourceSets.tomcatTest.runtimeClasspath
         testClassesDirs = sourceSets.tomcatTest.output.classesDirs
@@ -136,6 +144,6 @@ if (JavaVersion.current().isJava11Compatible()) {
     }
 
     tasks.named("check").configure {
-        dependsOn jetty11Test, tomcat10Test, undertowTest
+        dependsOn tomcat10Test, undertowTest
     }
 }