You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/02/09 09:07:36 UTC

[camel-kamelets] 06/06: Moving Actions to JDK 17

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch 4.0.0
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git

commit 7ced4574a90365c15e63002b703a6c9d3ea73922
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 9 10:06:58 2023 +0100

    Moving Actions to JDK 17
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .github/workflows/ci-build.yml         | 18 ++++++++----------
 .github/workflows/java-tests.yaml      | 19 ++++++-------------
 .github/workflows/main-push-regen.yaml | 13 ++++++-------
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 0ac6322e..5a650f64 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -47,19 +47,16 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java:
-          - '11'
     steps:
     - uses: actions/checkout@v3
       with:
         persist-credentials: false
-    - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: ${{ matrix.java }}
+        java-version: 17
+        cache: 'maven'
     - name: Build camel-kamelets
       run: ./mvnw -V -ntp clean install
     - name: Tar Maven Repo
@@ -81,10 +78,11 @@ jobs:
     - uses: actions/checkout@v3
       with:
         persist-credentials: false
-    - name: Set up JDK 11
-      uses: AdoptOpenJDK/install-jdk@v1
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
-        version: '11'
+        distribution: 'temurin'
+        java-version: 17
     - name: Deploy to ASF Snapshots Repository
       # Deploy both artifacts and sources (may be required by Camel K)
       run: |
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
index a6b02ca4..d8e016a5 100644
--- a/.github/workflows/java-tests.yaml
+++ b/.github/workflows/java-tests.yaml
@@ -34,23 +34,16 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '11' ]
     steps:
       - uses: actions/checkout@v2
         with:
           persist-credentials: false
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
-      - name: Cache Maven Repository
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 17
+        cache: 'maven'
       - name: Build catalog 1st Run
         run: ./mvnw clean install -DskipTests
       - name: Build catalog 2nd Run
diff --git a/.github/workflows/main-push-regen.yaml b/.github/workflows/main-push-regen.yaml
index 3f1f4caa..2ae6b558 100644
--- a/.github/workflows/main-push-regen.yaml
+++ b/.github/workflows/main-push-regen.yaml
@@ -30,17 +30,16 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '11' ]
     steps:
       - uses: actions/checkout@v2
         with:
           persist-credentials: false
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
+    - name: Set up JDK
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 17
+        cache: 'maven'
       - name: Install Go
         uses: actions/setup-go@v1
         with: