control-service: java 17

projects/control-service/cicd/.gitlab-ci.yml

@@ -22,24 +22,25 @@
   - projects/control-service/projects/helm_charts/pipelines-control-service/**/*
 
 .control_service_base_build:
-  image: docker:19.03.15
+  image: docker:20.10.21
   variables:
     _JAVA_OPTIONS: "-Xms2048m -Xmx4096m"
   before_script:
-    - apk --no-cache add git zip openjdk11-jdk curl zip python3 py3-pip  --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
+    - apk --no-cache add openjdk17-jdk --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
+    - apk --no-cache add git zip curl zip python3 py3-pip --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
     - pip3 install --upgrade pip && pip3 install awscli
 
 control_service_build_image:
   extends: .control_service_base_build
   services:
-    - docker:19.03.15-dind
+    - docker:20.10.21-dind
   variables:
     DOCKER_HOST: tcp://localhost:2375
     DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: ""
   stage: build
   script:
-    - apk --no-cache add git openjdk11-jdk --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
+    - apk --no-cache add git openjdk17-jdk --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
     - export TAG=$(git rev-parse --short HEAD)
     - cd projects/control-service/projects
     - ./gradlew -p ./model build publishToMavenLocal --info --stacktrace
@@ -191,7 +192,7 @@ control_service_publish_image:
     DOCKER_TLS_CERTDIR: ""
   stage: publish_artifacts
   script:
-    - apk add --no-cache git openjdk11-jdk
+    - apk add --no-cache git openjdk17-jdk
     - export TAG=$(git rev-parse --short HEAD)
     - docker login -u $VDK_DOCKER_REGISTRY_USERNAME -p $VDK_DOCKER_REGISTRY_PASSWORD
     - cd projects/control-service/projects
@@ -216,7 +217,7 @@ control_service_publish_api_client:
   image: docker:19.03.15
   stage: publish_artifacts
   script:
-    - apk add --no-cache py-pip openjdk11-jdk git python
+    - apk add --no-cache py-pip openjdk17-jdk git python
     - pip install -U pip setuptools wheel twine
     - ./projects/control-service/projects/gradlew -p ./projects/control-service/projects/model buildPython
     - cd projects/control-service/projects/model/apidefs/datajob-api/build

projects/control-service/projects/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

projects/control-service/projects/java-common.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'java'
 apply plugin: 'idea'
-sourceCompatibility = '11'
-targetCompatibility = '11'
+sourceCompatibility = '17'
+targetCompatibility = '17'
 group 'com.vmware.taurus'

projects/control-service/projects/model/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

projects/control-service/projects/pipelines_control_service/Dockerfile

@@ -4,15 +4,15 @@
 # Builder stage
 # This stage is implemented like in the guide, but it may be more efficient to
 # have it in the gradle build process outside docker.
-FROM adoptopenjdk:11-jre-hotspot as builder
+FROM adoptopenjdk:17-jre-hotspot as builder
 ARG JAR_NAME
 WORKDIR application
 COPY ./${JAR_NAME} application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
 
 # Final stage
-FROM adoptopenjdk:11-jre-hotspot
+FROM adoptopenjdk:17-jre-hotspot
 LABEL maintainer="Project Versatile Data Kit <[email protected]>"
 
 # install kerberos client so that we can use kadmin