Implement OpenJDK 9 Image

.travis.yml

@@ -22,7 +22,8 @@ services:
 jdk:
   - oraclejdk8
 
-install: mvn dependency:resolve
+# skip the install step
+install: true
 script: mvn --batch-mode clean verify
 
 branches:

DEVELOPING.md

@@ -9,25 +9,33 @@ To build the image you need git, docker (your user needs to be part of the ``doc
 ```
 $ git clone https://github.com/GoogleCloudPlatform/openjdk-runtime.git
 $ cd openjdk-runtime
+
+# build all images
 $ mvn clean install
+
+# only build the openjdk:8 image
+$ mvn clean install --also-make --projects openjdk8
+
+# only build the openjdk:9 image
+$ mvn clean install --also-make --projects openjdk9
 ```
-The resulting image is called openjdk
+These commands build the `openjdk` image with tags for each JDK version (`openjdk:8` and `openjdk:9`).
 
 ### Cloud build
 To build using the [Google Cloud Container Builder](https://cloud.google.com/container-builder/docs/overview), 
 you need to have the [Google Cloud SDK](https://cloud.google.com/sdk/) installed locally. We provide a script to make this more convenient.
 ```
-# the following commands will build and push an image named "gcr.io/my-project/openjdk:tag"
+# the following commands will build and push an image named "gcr.io/my-project/openjdk:8"
 $ PROJECT_ID=my-project
-$ TAG=tag                     #optional
-$ ./scripts/build.sh gcr.io/$PROJECT_ID $TAG
+$ MODULE_TO_BUILD=openjdk8 # only builds the openjdk:8 image
+$ ./scripts/build.sh -d gcr.io/$PROJECT_ID -m $MODULE_TO_BUILD
 ```
 
 If you would like to simulate the cloud build locally, pass in the `--local` argument.
 ```
 $ PROJECT_ID=my-project
-$ TAG=tag                     #optional
-$ ./scripts/build.sh gcr.io/$PROJECT_ID $TAG --local
+$ MODULE_TO_BUILD=openjdk8 # only builds the openjdk:8 image
+$ ./scripts/build.sh -d gcr.io/$PROJECT_ID -m $MODULE_TO_BUILD --local
 ```
 
 # Running Tests

README.md

@@ -1,18 +1,32 @@
-![Build Status](http://storage.googleapis.com/java-runtimes-kokoro-build-badges/openjdk-runtime-master.png)
+![Build Status](http://storage.googleapis.com/java-runtimes-kokoro-build-badges/openjdk-runtime-master.png) 
+
+![Stability](https://img.shields.io/badge/gcr.io/google--appengine/openjdk:8-stable-green.svg)
+![Stability](https://img.shields.io/badge/gcr.io/google--appengine/openjdk:9-unstable-red.svg)
 
 # Google Cloud Platform OpenJDK Docker Image
 
 This repository contains the source for the Google-maintained OpenJDK [docker](https://docker.com) image. This image can be used as the base image for running Java applications on [Google App Engine Flexible Environment](https://cloud.google.com/appengine/docs/flexible/java/) and [Google Container Engine](https://cloud.google.com/container-engine).
 
-This image is mirrored at both `launcher.gcr.io/google/openjdk8` and `gcr.io/google-appengine/openjdk`.
+## Repository/Tag Details
+Supported images/tags include:
+* `gcr.io/google-appengine/openjdk:8`, also mirrored at `launcher.gcr.io/google/openjdk8` 
+* `gcr.io/google-appengine/openjdk:9` (currently in beta)
 
 ## App Engine Flexible Environment
 When using App Engine Flexible, you can use the runtime without worrying about Docker by specifying `runtime: java` in your `app.yaml`:
 ```yaml
 runtime: java
 env: flex
 ```
-The runtime image `gcr.io/google-appenine/openjdk` will be automatically selected if you are attempting to deploy a JAR (`*.jar` file).
+The runtime image `gcr.io/google-appenine/openjdk:8` will be automatically selected if you are attempting to deploy a JAR (`*.jar` file).
+
+To select a jdk version, use the `runtime_config.jdk` field in app.yaml. Supported JDK versions include `openjdk8` and `openjdk9`.
+```yaml
+runtime: java
+env: flex
+runtime_config:
+  jdk: openjdk8
+```
 
 If you want to use the image as a base for a custom runtime, you can specify `runtime: custom` in your `app.yaml` and then
 write the Dockerfile like this:

cloudbuild.yaml

@@ -2,19 +2,15 @@
 # https://cloud.google.com/container-builder/docs/overview
 
 steps:
-# Build the maven project, omitting the docker build step
 - name: 'gcr.io/cloud-builders/java/mvn:3.3.9-jdk-8'
-  args: ['-P-local-docker-build', '-Ddocker.tag.long=${_DOCKER_TAG}', 'clean', 'install']
-  id: 'MAVEN'
-# Execute the docker build
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '--tag=${_IMAGE}', '--no-cache', 'openjdk8/target/docker']
-  id: 'DOCKER'
-
-# Runtimes-common structure tests
-# See https://github.com/GoogleCloudPlatform/runtimes-common/tree/master/structure_tests
-- name: 'gcr.io/gcp-runtimes/structure_test'
-  args: ['--image', '${_IMAGE}', '-v', '--config', '/workspace/openjdk8/target/test-classes/structure.yaml']
-  id: 'STRUCTURE_TEST'
+  args:
+  - 'clean'
+  - 'install'
+  - '--batch-mode'
+  - '-Ddocker.image.name=${_IMAGE}'
+  # only build the specified module
+  - '--projects=${_MODULE}'
+  - '--also-make'
+  id: 'MVN_PACKAGE'
 
 images: ['${_IMAGE}']

openjdk-common/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2016 Google Inc. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.google.cloud.runtimes</groupId>
+    <artifactId>openjdk-parent</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <name>Openjdk Common Docker Configuration</name>
+  <artifactId>openjdk-common</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/assembly.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

openjdk-common/src/main/assembly/assembly.xml

@@ -0,0 +1,36 @@
+<!--
+  ~ Copyright 2017 Google Inc. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>assembly</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <baseDirectory>src/main/docker</baseDirectory>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <filtered>false</filtered>
+      <directory>src/main/docker</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

openjdk8/src/main/docker/setup-env.d/05-utils.bash → openjdk-common/src/main/docker/setup-env.d/05-utils.bash

@@ -3,8 +3,8 @@
 is_true() {
   # case insensitive check for "true"
   if [[ ${1,,} = "true" ]]; then
-    return ${true}
+    true
   else
-    return ${false}
+    false
   fi
 }

openjdk-test-common/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2016 Google Inc. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.google.cloud.runtimes</groupId>
+    <artifactId>openjdk-parent</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <name>Openjdk Common Test resources</name>
+  <artifactId>openjdk-test-common</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/assembly.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

openjdk-test-common/src/main/assembly/assembly.xml

@@ -0,0 +1,36 @@
+<!--
+  ~ Copyright 2017 Google Inc. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>assembly</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <baseDirectory>src/test/resources</baseDirectory>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <filtered>false</filtered>
+      <directory>src/test/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

openjdk8/src/test/resources/structure.yaml → openjdk-test-common/src/test/resources/structure.yaml

@@ -5,60 +5,54 @@
 schemaVersion: 1.0.0
 
 commandTests:
-- name: 'correct java version is installed'
-  command: ['java', '-version']
-  expectedError: ['openjdk version "1\.${openjdk.version.major}.*${openjdk.version.minor}"']
-- name: 'ensure blacklisted packages are not installed as a dependency accidentally'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/test-blacklisted-pkgs.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/test-blacklisted-pkgs.bash' ]
-  excludedOutput: ['NOT OK.* is installed']
-- name: 'correct javac version is installed'
-  command: ['javac', '-version']
-  expectedError: ['javac 1\.${openjdk.version.major}.*${openjdk.version.minor}']
 - name: 'OPENJDK_VERSION env variable is set correctly'
   command: ['env']
   expectedOutput: ['OPENJDK_VERSION=${openjdk.version}']
 - name: 'GAE_IMAGE_LABEL env variable is set correctly'
   command: ['env']
   expectedOutput: ['GAE_IMAGE_LABEL=${docker.tag.long}']
 - name: 'check entrypoint default'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/entrypoint-default.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/entrypoint-default.bash' ]
+  setup: [[ 'chmod', '+x', '/workspace/entrypoint-default.bash' ]]
+  command: [ '/workspace/entrypoint-default.bash' ]
   expectedOutput: ['OK']
   exitCode: 0
 - name: 'check entrypoint args only'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/entrypoint-args-only.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/entrypoint-args-only.bash' ]
+  setup: [[ 'chmod', '+x', '/workspace/entrypoint-args-only.bash' ]]
+  command: [ '/workspace/entrypoint-args-only.bash' ]
   expectedOutput: ['OK']
   exitCode: 0
 - name: 'check entrypoint setup'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/entrypoint-setup.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/entrypoint-setup.bash' ]
+  setup: [[ 'chmod', '+x', '/workspace/entrypoint-setup.bash' ]]
+  command: [ '/workspace/entrypoint-setup.bash' ]
   expectedOutput: ['OK']
   exitCode: 0
 - name: 'check setup platform'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/setup-platform.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/setup-platform.bash' ]
+  setup: [[ 'chmod', '+x', '/workspace/setup-platform.bash' ]]
+  command: [ '/workspace/setup-platform.bash' ]
   expectedOutput: ['OK']
   exitCode: 0
 - name: 'check setup java'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/setup-java.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/setup-java.bash' ]
+  setup: [[ 'chmod', '+x', '/workspace/setup-java.bash' ]]
+  command: [ '/workspace/setup-java.bash' ]
   expectedOutput: ['OK']
   exitCode: 0
 - name: 'check setup cloud debugger'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/setup-debug.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/setup-debug.bash' ]
+  setup: [[ 'chmod', '+x', '/workspace/setup-debug.bash' ]]
+  command: [ '/workspace/setup-debug.bash' ]
   expectedOutput: ['OK']
   exitCode: 0
 - name: 'APP_DESTINATION env variable is set'
   command: ['env']
   expectedOutput: ['APP_DESTINATION=app.jar']
 - name: 'check shutdown logging wrapper setup'
-  setup: [[ 'chmod', '+x', '/workspace/openjdk8/src/test/workspace/shutdown-env.bash' ]]
-  command: [ '/workspace/openjdk8/src/test/workspace/shutdown-env.bash' ]
+  setup: [[ 'chmod', '+x', '/workspace/shutdown-env.bash' ]]
+  command: [ '/workspace/shutdown-env.bash' ]
   expectedOutput: ['OK']
   exitCode: 0
+- name: 'ensure blacklisted packages are not installed as a dependency accidentally'
+  setup: [[ 'chmod', '+x', '/workspace/test-blacklisted-pkgs.bash' ]]
+  command: [ '/workspace/test-blacklisted-pkgs.bash' ]
+  excludedOutput: ['NOT OK.* is installed']
 
 fileExistenceTests:
 - name: 'ssl certificates are present'