chore: update to temurin 17 (eclipse-tractusx#212)

paullatzelsperger · web-flow · commit 31d879dbd6e7 · 2023-04-14T10:27:58.000+02:00
* chore: update dockerfiles and GH Actions to temurin 17

* pin specific version
diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
@@ -60,7 +60,7 @@ runs:
     - name: Set up JDK 11
       uses: actions/setup-java@v3.11.0
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: 'gradle'
     - name: Build Controlplane
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -73,7 +73,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
@@ -147,7 +147,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Import GPG Key
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
@@ -55,7 +55,7 @@ jobs:
         name: Set-Up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
@@ -36,7 +36,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -60,7 +60,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -181,7 +181,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
@@ -33,7 +33,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
@@ -62,7 +62,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
@@ -111,7 +111,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -63,7 +63,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Verify proper formatting
@@ -96,7 +96,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -113,7 +113,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -130,7 +130,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -147,7 +147,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -168,7 +168,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Cache SonarCloud packages
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-memory/notice.md b/edc-controlplane/edc-controlplane-memory/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-dataplane/edc-dataplane-azure-vault/notice.md b/edc-dataplane/edc-dataplane-azure-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ jobs:`
`55`	`55`	`name: Set-Up JDK 11`
`56`	`56`	`uses: actions/setup-java@v3.11.0`
`57`	`57`	`with:`
`58`		`- java-version: '11'`
	`58`	`+ java-version: '17'`
`59`	`59`	`distribution: 'temurin'`
`60`	`60`	`cache: 'gradle'`
`61`	`61`	`-`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ jobs:`
`36`	`36`	`name: Set up JDK 11`
`37`	`37`	`uses: actions/setup-java@v3.11.0`
`38`	`38`	`with:`
`39`		`- java-version: '11'`
	`39`	`+ java-version: '17'`
`40`	`40`	`distribution: 'temurin'`
`41`	`41`	`cache: 'gradle'`
`42`	`42`	`-`