fix(client-java): keep Temurin 21 toolchain, auto-provision instead of bumping to 26

This commit is contained in:
Joseph Doherty
2026-06-01 07:20:04 -04:00
parent fe7d1ce1ec
commit ba82afe669
3 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ subprojects {
pluginManager.withPlugin('java') { pluginManager.withPlugin('java') {
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(26) languageVersion = JavaLanguageVersion.of(21)
} }
} }
+4
View File
@@ -9,6 +9,10 @@ pluginManagement {
} }
} }
plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
}
dependencyResolutionManagement { dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories { repositories {
@@ -1,7 +1,6 @@
package com.zb.mom.ww.mxgateway.client; package com.zb.mom.ww.mxgateway.client;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import mxaccess_gateway.v1.MxAccessGatewayGrpc; import mxaccess_gateway.v1.MxAccessGatewayGrpc;
import mxaccess_gateway.v1.MxaccessGateway.OpenSessionRequest; import mxaccess_gateway.v1.MxaccessGateway.OpenSessionRequest;
@@ -25,8 +24,6 @@ final class GeneratedContractSmokeTests {
@Test @Test
void javaTwentyOneToolchainRunsTests() { void javaTwentyOneToolchainRunsTests() {
// Accept Java 21 or later; locally macOS has JDK 26 (only JDK 26 is installed). assertEquals(21, Runtime.version().feature());
assertTrue(Runtime.version().feature() >= 21,
"expected Java 21+ but got " + Runtime.version());
} }
} }