Skip to content

Commit 5b9b147

Browse files
committed
Remove Java 9 dockerfiles, update builds and tests
1 parent 8be6ffa commit 5b9b147

5 files changed

Lines changed: 3 additions & 33 deletions

File tree

build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ mvn -B deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
3131

3232
(
3333
cd images/build
34-
./docker-build.sh -f Dockerfile-jdk9 -t fnproject/fn-java-fdk-build:jdk9-${BUILD_VERSION} .
3534
./docker-build.sh -f Dockerfile-jdk11 -t fnproject/fn-java-fdk-build:jdk11-${BUILD_VERSION} .
3635
)
3736

@@ -42,7 +41,6 @@ mvn -B deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
4241

4342
(
4443
cd runtime
45-
docker build -f ../images/runtime/Dockerfile-jdk9 -t fnproject/fn-java-fdk:jdk9-${BUILD_VERSION} .
4644
docker build -f ../images/runtime/Dockerfile-jre11 -t fnproject/fn-java-fdk:jre11-${BUILD_VERSION} .
4745
)
4846

images/build/Dockerfile-jdk9

Lines changed: 0 additions & 8 deletions
This file was deleted.

images/runtime/Dockerfile-jdk9

Lines changed: 0 additions & 20 deletions
This file was deleted.

images/runtime/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Fn Java runtime base image
1+
# Fn Java runtime base images
22

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void shouldCallExistingFn() throws Exception {
4646
@Test()
4747
public void checkBoilerPlate() throws Exception {
4848
for (String format : new String[]{"http-stream"}) {
49-
for (String runtime : new String[]{"java9", "java8"}) {
49+
for (String runtime : new String[]{"java8", "java11"}) {
5050
IntegrationTestRule.TestContext tc = testRule.newTest();
5151

5252
String fnName = "bp" + format + runtime;

0 commit comments

Comments
 (0)