Skip to content

Commit

Permalink
Change GAE interop tests to use java11 runtime (grpc#10933)
Browse files Browse the repository at this point in the history
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 grpc#10925
  • Loading branch information
ejona86 committed Feb 24, 2024
1 parent 597f26e commit 81cd893
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@

package io.grpc.testing.integration;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import io.grpc.Grpc;
import io.grpc.ManagedChannelBuilder;
import io.grpc.TlsChannelCredentials;
Expand Down Expand Up @@ -131,14 +128,9 @@ private void doGetHelper(HttpServletResponse resp) throws IOException {
public static final class Tester extends AbstractInteropTest {
@Override
protected ManagedChannelBuilder<?> createChannelBuilder() {
assertEquals(
"jdk8 required",
"1.8",
System.getProperty("java.specification.version"));
ManagedChannelBuilder<?> builder =
Grpc.newChannelBuilder(INTEROP_TEST_ADDRESS, TlsChannelCredentials.create())
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE);
assertTrue(builder instanceof NettyChannelBuilder);
((NettyChannelBuilder) builder)
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW);
return builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
-->
<!-- [START config] -->
<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
<threadsafe>true</threadsafe>
<service>java-gae-interop-test</service>
<runtime>java8</runtime>
<runtime>java11</runtime>
</appengine-web-app>
<!-- [END config] -->

0 comments on commit 81cd893

Please sign in to comment.