Merge branch 'master' into remove-unsupported-formats

Author: rikgibson

examples/async-thumbnails/pom.xml

@@ -10,7 +10,7 @@
 
         <fdk.version>1.0.0-SNAPSHOT</fdk.version>
         <mockito.version>2.8.47</mockito.version>
-        <jackson.version>2.9.7</jackson.version>
+        <jackson.version>2.9.8</jackson.version>
     </properties>
 
     <groupId>com.fnproject.fn.examples</groupId>

examples/regex-query/pom.xml

@@ -9,7 +9,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <fdk.version>1.0.0-SNAPSHOT</fdk.version>
-        <jackson.version>2.9.7</jackson.version>
+        <jackson.version>2.9.8</jackson.version>
     </properties>
 
     <groupId>com.fnproject.fn.examples</groupId>

images/build-native/Dockerfile

@@ -20,7 +20,7 @@ RUN set -x \
     && cp -r $(/build/mx/mx --primary-suite graal-jvmci-8 jdkhome) /build/jvmcijdk8
 
 RUN git clone https://github.com/oracle/graal.git \
-    && git -C graal checkout vm-1.0.0-rc9
+    && git -C graal checkout vm-1.0.0-rc11
 WORKDIR /build/graal/vm
 RUN export JAVA_HOME=/build/jvmcijdk8 \
     && /build/mx/mx --dy /substratevm --force-bash-launchers=true --disable-polyglot --disable-libpolyglot build

images/build-native/native.version

@@ -1 +1 @@
-0.2.0
+0.3.0

images/init-native/func.init.yaml

@@ -1,2 +0,0 @@
-runtime: docker
-format: http-stream

images/init-native/pom.xml

@@ -67,6 +67,22 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.1</version>
+                <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

integration-tests/pom.xml

@@ -11,7 +11,7 @@
     <properties>
         <assertj-core.version>3.6.2</assertj-core.version>
         <commons-io.version>2.5</commons-io.version>
-        <jackson.version>2.9.6</jackson.version>
+        <jackson.version>2.9.8</jackson.version>
         <junit.version>4.12</junit.version>
         <surefire.version>2.22.1</surefire.version>
     </properties>

integration-tests/src/test/java/com/fnproject/fn/integrationtest/FunctionsTest.java

@@ -45,21 +45,18 @@ public void shouldCallExistingFn() throws Exception {
 
     @Test()
     public void checkBoilerPlate() throws Exception {
-        for (String format : new String[]{"http-stream"}) {
-            for (String runtime : new String[]{"java9", "java8"}) {
-                IntegrationTestRule.TestContext tc = testRule.newTest();
-
-                String fnName = "bp" + format + runtime;
-                tc.runFn("init", "--runtime", runtime, "--name", fnName, "--format", format);
-                tc.rewritePOM();
-                tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
-                CmdResult rs = tc.runFnWithInput("wibble", "invoke", tc.appName(), fnName);
-                assertThat(rs.getStdout()).contains("Hello, wibble!");
-            }
+        for (String runtime : new String[]{"java8", "java9", "java11"}) {
+            IntegrationTestRule.TestContext tc = testRule.newTest();
+
+            String fnName = "bp" + runtime;
+            tc.runFn("init", "--runtime", runtime, "--name", fnName);
+            tc.rewritePOM();
+            tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
+            CmdResult rs = tc.runFnWithInput("wibble", "invoke", tc.appName(), fnName);
+            assertThat(rs.getStdout()).contains("Hello, wibble!");
         }
     }
 
-
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class InspectResponse {
 

pom.xml

@@ -30,7 +30,7 @@
         <assertj-core.version>3.10.0</assertj-core.version>
         <commons-io.version>2.6</commons-io.version>
         <httpcore.version>4.4.10</httpcore.version>
-        <jackson.version>2.9.7</jackson.version>
+        <jackson.version>2.9.8</jackson.version>
         <jacoco.version>0.8.1</jacoco.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <junit.version>4.12</junit.version>

release.version

@@ -1 +1 @@
-1.0.80
+1.0.84