Skip to content

Commit

Permalink
Consistenly switch from AdoptOpenJDK to Eclipse Temurin
Browse files Browse the repository at this point in the history
The former is deprecated in favor of the latter, see [1].

[1]: https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/

Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed Feb 17, 2022
1 parent 64ad692 commit 58eee32
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Build all classes
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Build the reporter-web-app
Expand All @@ -50,7 +50,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run unit tests
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run functional tests
Expand All @@ -97,7 +97,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run functional tests
Expand All @@ -113,7 +113,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run functional tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Check for Detekt Issues
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ARG CRT_FILES=""
# Set this to the ScanCode version to use.
ARG SCANCODE_VERSION="30.1.0"

FROM adoptopenjdk:11-jdk-hotspot-focal AS build
FROM eclipse-temurin:11-jdk-focal AS build

COPY . /usr/local/src/ort

Expand All @@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/tmp/.gradle/ \
sed -i -r '/distributionSha256Sum=[0-9a-f]{64}/d' gradle/wrapper/gradle-wrapper.properties && \
./gradlew --no-daemon --stacktrace -Pversion=$ORT_VERSION :cli:distTar :helper-cli:startScripts

FROM adoptopenjdk:11-jdk-hotspot-focal AS run
FROM eclipse-temurin:11-jdk-focal AS run

ENV \
# Package manager versions.
Expand Down
2 changes: 1 addition & 1 deletion batect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ config_variables:

containers:
build:
image: adoptopenjdk:11-jdk-hotspot-focal
image: eclipse-temurin:11-jdk-focal
<<: *common-container-config
run:
build_directory: <{batect.project_directory}
Expand Down

0 comments on commit 58eee32

Please sign in to comment.