chore(build): use AdoptOpenJDK to set-up java

apache · Oct 7, 2020 · 932db48 · 932db48
1 parent 75ccafa
commit 932db48
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/asf-snapshots-deploy.yml b/.github/workflows/asf-snapshots-deploy.yml
@@ -26,13 +26,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '1.8' ]
+        java: [ '8' ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: ${{ matrix.java }}
+          version: ${{ matrix.java }}
       - name: Cache Maven Repository
         uses: actions/cache@v1
         with:

diff --git a/.github/workflows/automatic-sync-camel-master.yml b/.github/workflows/automatic-sync-camel-master.yml
@@ -35,10 +35,10 @@ jobs:
           repository: apache/camel
           ref: master
           path: camel
-      - name: Set Up Java
-        uses: actions/setup-java@v1
+      - name: Set up JDK ${{ matrix.java }}
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: ${{ matrix.java }}
+          version: ${{ matrix.java }}
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml
@@ -26,13 +26,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '1.8', '11' ]
+        java: [ '8', '11' ]
     steps:
       - uses: actions/checkout@v1
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: ${{ matrix.java }}
+          version: ${{ matrix.java }}
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/master-push-build.yml b/.github/workflows/master-push-build.yml
@@ -30,9 +30,9 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: ${{ matrix.java }}
+          version: ${{ matrix.java }}
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/rebase-master-onto-camel-master.yml b/.github/workflows/rebase-master-onto-camel-master.yml
@@ -53,9 +53,9 @@ jobs:
           git rebase origin/master
           git rev-parse origin/master > ~/build-data/master-sha.txt
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: ${{ matrix.java }}
+          version: ${{ matrix.java }}
       - name: mvn sourcecheck + build and itests
         run: |
           ./mvnw -V --no-transfer-progress -DskipTests --projects org.apache.camel.kafkaconnector:parent,org.apache.camel.kafkaconnector:camel-kafka-connector-aggregator,org.apache.camel.kafkaconnector:camel-buildtools clean install