diff --git a/.github/workflows/ci-build-32.yml b/.github/workflows/ci-build-32.yml index 5f80b5faad..88526e58d1 100644 --- a/.github/workflows/ci-build-32.yml +++ b/.github/workflows/ci-build-32.yml @@ -19,23 +19,23 @@ jobs: fail-fast: false matrix: java: [ '11', '17' ] - maven: [ '3.8.4'] - os: [ 'ubuntu-20.04' ] + maven: [ '3.8.6'] + os: [ 'ubuntu-22.04' ] name: Build (Java ${{ matrix.java }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} steps: - name: Checkout if: github.head_ref == '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Checkout merge if: github.head_ref != '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: refs/pull/${{github.event.pull_request.number}}/merge - name: Set up Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository @@ -46,13 +46,13 @@ jobs: ${{ runner.os }}-maven- - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'zulu' + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Set up Maven ${{ matrix.maven }} - uses: stCarolas/setup-maven@v4.2 + uses: stCarolas/setup-maven@v4.5 with: maven-version: ${{ matrix.maven }} diff --git a/.github/workflows/ci-build-40.yml b/.github/workflows/ci-build-40.yml index 251c2a4b38..2c60c0cbcf 100644 --- a/.github/workflows/ci-build-40.yml +++ b/.github/workflows/ci-build-40.yml @@ -19,23 +19,23 @@ jobs: fail-fast: false matrix: java: [ '17' ] - maven: [ '3.8.4'] - os: [ 'ubuntu-20.04' ] + maven: [ '3.8.6'] + os: [ 'ubuntu-22.04' ] name: Build (Java ${{ matrix.java }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} steps: - name: Checkout if: github.head_ref == '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Checkout merge if: github.head_ref != '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: refs/pull/${{github.event.pull_request.number}}/merge - name: Set up Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository @@ -46,13 +46,13 @@ jobs: ${{ runner.os }}-maven- - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'zulu' + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Set up Maven ${{ matrix.maven }} - uses: stCarolas/setup-maven@v4.2 + uses: stCarolas/setup-maven@v4.5 with: maven-version: ${{ matrix.maven }} diff --git a/bundles/pom.xml b/bundles/pom.xml index 8ea591842e..569427fe7c 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -162,7 +162,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.version} + 4.3.9 true 80 diff --git a/features/pom.xml b/features/pom.xml index fb4d038717..583a5d2c98 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -55,7 +55,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.version} + 4.3.9 true 80