Merge branch 'master' into remove-unsupported-formats

Author: rikgibson

build.sh

@@ -31,7 +31,6 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
 
 (
   cd images/build
-  ./docker-build.sh -f Dockerfile-jdk9 -t fnproject/fn-java-fdk-build:jdk9-${BUILD_VERSION} .
   ./docker-build.sh -f Dockerfile-jdk11 -t fnproject/fn-java-fdk-build:jdk11-${BUILD_VERSION} .
 )
 
@@ -42,7 +41,6 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
 
 (
    cd runtime
-   docker build -f ../images/runtime/Dockerfile-jdk9 -t fnproject/fn-java-fdk:jdk9-${BUILD_VERSION} .
    docker build -f ../images/runtime/Dockerfile-jre11 -t fnproject/fn-java-fdk:jre11-${BUILD_VERSION} .
 )
 

images/build/Dockerfile-jdk9

@@ -1,3 +1,3 @@
-# Fn Java runtime base image 
+# Fn Java runtime base images
 
-This image is used as a base image for functions  - it includes a JDK and the latest version of the runtime 
+These images are used as a base image for functions - they include a JDK and the latest version of the runtime 

images/runtime/Dockerfile-jdk9

@@ -1,7 +1,7 @@
 schema_version: 20180708
 name: flowexithooks
 version: 0.0.3
-runtime: java9
+runtime: java11
 cmd: com.fnproject.fn.integration.test_5.CompleterFunction::handleRequest
 format: http-stream
 timeout: 120

images/runtime/README.md

@@ -1,7 +1,7 @@
 schema_version: 20180708
 name: flowtimeouts
 version: 0.0.3
-runtime: java9
+runtime: java11
 cmd: com.fnproject.fn.integration.test_6.CompleterFunction::handleRequest
 format: http-stream
 timeout: 120

integration-tests/funcs/flowExitHooks/func.yaml

@@ -1,6 +1,6 @@
 schema_version: 20180708
 name: simplefunc
 version: 0.0.3
-runtime: java9
+runtime: java11
 cmd: com.fnproject.fn.integration.test2.PlainFunction::handleRequest
 format: http-stream

integration-tests/funcs/flowTimeouts/func.yaml

@@ -45,7 +45,7 @@ public void shouldCallExistingFn() throws Exception {
 
     @Test()
     public void checkBoilerPlate() throws Exception {
-        for (String runtime : new String[]{"java8", "java9", "java11"}) {
+        for (String runtime : new String[]{"java8", "java11"}) {
             IntegrationTestRule.TestContext tc = testRule.newTest();
 
             String fnName = "bp" + runtime;