Skip to content

Commit 7089f04

Browse files
committed
Change GAE interop tests to use java11 runtime (#10933)
The Java 8 runtime is end of support. Leaving this a gae-jdk8 for now. The gae-jdk8 was because AppEngine changed dramatically from Java 7 to Java 8. Nowadays the versions are more in line with OpenJDK and not very different from each other. Fixes #10925
1 parent 597f26e commit 7089f04

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

gae-interop-testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package io.grpc.testing.integration;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertTrue;
21-
2219
import io.grpc.Grpc;
2320
import io.grpc.ManagedChannelBuilder;
2421
import io.grpc.TlsChannelCredentials;
@@ -131,14 +128,9 @@ private void doGetHelper(HttpServletResponse resp) throws IOException {
131128
public static final class Tester extends AbstractInteropTest {
132129
@Override
133130
protected ManagedChannelBuilder<?> createChannelBuilder() {
134-
assertEquals(
135-
"jdk8 required",
136-
"1.8",
137-
System.getProperty("java.specification.version"));
138131
ManagedChannelBuilder<?> builder =
139132
Grpc.newChannelBuilder(INTEROP_TEST_ADDRESS, TlsChannelCredentials.create())
140133
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE);
141-
assertTrue(builder instanceof NettyChannelBuilder);
142134
((NettyChannelBuilder) builder)
143135
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW);
144136
return builder;

gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
-->
1414
<!-- [START config] -->
1515
<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
16-
<threadsafe>true</threadsafe>
1716
<service>java-gae-interop-test</service>
18-
<runtime>java8</runtime>
17+
<runtime>java11</runtime>
1918
</appengine-web-app>
2019
<!-- [END config] -->

0 commit comments

Comments
 (0)