Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update to temurin 17 #212

Merged
merged 2 commits into from
Apr 14, 2023
Merged

chore: update to temurin 17 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b15397e
chore: update dockerfiles and GH Actions to temurin 17
paullatzelsperger Apr 13, 2023
f1792ce
pin specific version
paullatzelsperger Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/publish-docker-image/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/business-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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'
-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/veracode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
-
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'

Expand All @@ -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'

Expand All @@ -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'

Expand All @@ -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'

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-memory/notice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-postgresql/notice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-dataplane/edc-dataplane-azure-vault/notice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down