Merge branch 'master' into remove-unsupported-formats

Author: rikgibson

.circleci/release.sh

@@ -58,20 +58,6 @@ mvn -s ./settings-deploy.xml \
   docker push ${USER}/${BUILD_IMAGE}:${release_version}
   docker push ${USER}/${BUILD_IMAGE}:${moving_version}
 
-  ## jdk9 runtime
-  docker tag ${USER}/${RUNTIME_IMAGE}:jdk9-${release_version} ${USER}/${RUNTIME_IMAGE}:jdk9-latest
-  docker tag ${USER}/${RUNTIME_IMAGE}:jdk9-${release_version} ${USER}/${RUNTIME_IMAGE}:jdk9-${moving_version}
-  docker push ${USER}/${RUNTIME_IMAGE}:jdk9-latest
-  docker push ${USER}/${RUNTIME_IMAGE}:jdk9-${release_version}
-  docker push ${USER}/${RUNTIME_IMAGE}:jdk9-${moving_version}
-
-  ## jdk9 build
-  docker tag ${USER}/${BUILD_IMAGE}:jdk9-${release_version} ${USER}/${BUILD_IMAGE}:jdk9-latest
-  docker tag ${USER}/${BUILD_IMAGE}:jdk9-${release_version} ${USER}/${BUILD_IMAGE}:jdk9-${moving_version}
-  docker push ${USER}/${BUILD_IMAGE}:jdk9-latest
-  docker push ${USER}/${BUILD_IMAGE}:jdk9-${release_version}
-  docker push ${USER}/${BUILD_IMAGE}:jdk9-${moving_version}
-
   ## jre11 runtime
   docker tag ${USER}/${RUNTIME_IMAGE}:jre11-${release_version} ${USER}/${RUNTIME_IMAGE}:jre11-latest
   docker tag ${USER}/${RUNTIME_IMAGE}:jre11-${release_version} ${USER}/${RUNTIME_IMAGE}:jre11-${moving_version}

examples/gradle-build/README.md

@@ -11,4 +11,4 @@ Key points:
 * [Dockerfile](Dockerfile) - contains the containerised docker build (based on dockerhub library/gradle images) and image build - this includes the gradle invocation
 * The `cacheDeps` task in `build.gradle` is invoked within the Dockerfile - The task pulls down dependencies into the container gradle cache to speed up docker builds. 
 * The `copyDeps` task in `build.gradle` copies the functions compile deps 
-* This uses JDK 8 by default  - you can change this to Java 9 by changing :  `FROM gradle:4.5.1-jdk8 as build-stage` to `FROM gradle:4.5.1-jdk9 as build-stage` and  `FROM fnproject/fn-java-fdk:1.0.56` to `FROM fnproject/fn-java-fdk:jdk9-1.0.56` 
+* This uses JDK 8 by default  - you can change this to Java 11 by changing :  `FROM gradle:4.5.1-jdk8 as build-stage` to `FROM gradle:4.5.1-jre11 as build-stage` and  `FROM fnproject/fn-java-fdk:1.0.85` to `FROM fnproject/fn-java-fdk:jre11-1.0.85` 

release.version

@@ -1 +1 @@
-1.0.84
+1.0.86