Merge branch 'master' into derivableBugFix

.gitlab-ci.yml

 # This is the Gradle build system for JVM applications
 # https://gradle.org/
 # https://github.com/gradle/gradle
-image: key-dev-jdk10
+image: key-dev-jdk8
 
 cache:
   paths:
@@ -13,9 +13,7 @@ cache:
 # runtime for each build is more reliable since the runtime is completely
 # isolated from any previous builds.
 variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false \
-                --add-modules java.xml.bind \
-                '-Dorg.gradle.jvmargs=--add-modules java.xml.bind'"
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
   GIT_SSL_NO_VERIFY: "true"
 
 before_script:
@@ -28,32 +26,6 @@ stages:
   - test
   - deploy
 
-build:jdk9:
-  stage: build
-  image: key-dev-jdk9
-  script: gradle --build-cache assemble
-  allow_failure: true
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: push
-    paths:
-      - build
-      - .gradle
-
-
-build:jdk10:
-  stage: build
-  image: key-dev-jdk10
-  script: gradle --build-cache assemble
-  allow_failure: true
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: push
-    paths:
-      - build
-      - .gradle
-
-
 build:jdk8:
   stage: build
   variables: