Merge f61684a into 5a30316

smallrye · Aug 15, 2021 · ad29f96 · ad29f96
2 parents 5a30316 + f61684a
commit ad29f96
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 33 deletions.
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -14,9 +14,10 @@ jobs:
  strategy:
  matrix:
  java: [
- { 'version': '8', 'source': 'releases', opts: '' },
- { 'version': '11', 'source': 'releases', opts: '' },
- { 'version': '16', 'source': 'nightly', 'opts': '--illegal-access=permit' } # required for kotlin on java 16
+ { 'version': '8', opts: '' },
+ { 'version': '11', opts: '' },
+ { 'version': '16', 'opts': '--illegal-access=permit' }, # required for kotlin on java 16
+ { 'version': '17-ea', 'opts': '--illegal-access=permit' } # required for kotlin on java 17
  ]
  name: Build with Java ${{ matrix.java.version }} (OpenJDK)
  steps:
@@ -25,10 +26,11 @@ jobs:
  path: ~/.m2/repository
  key: maven-java-${{ matrix.java.version }}
  - uses: actions/checkout@v2
- - uses: AdoptOpenJDK/install-jdk@v1
+ - uses: actions/setup-java@v2
+ name: set up jdk ${{matrix.java.version}}
  with:
- version: ${{ matrix.java.version }}
- source: ${{ matrix.java.source }}
+ distribution: adopt
+ java-version: ${{matrix.java.version}}
  - name: Build with Maven
  env:
  MAVEN_OPTS: ${{ matrix.java.opts }}
@@ -43,10 +45,10 @@ jobs:
  path: ~/.m2/repository
  key: maven-11
  - uses: actions/checkout@v2
- - name: Install JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ - uses: actions/setup-java@v2
  with:
- version: 11
+ java-version: 11
+ distribution: adopt
  - name: Deploy snapshots
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -64,10 +66,10 @@ jobs:
  path: ~/.m2/repository
  key: maven-11
  - uses: actions/checkout@v2
- - name: Install JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ - uses: actions/setup-java@v2
  with:
- version: 11
+ java-version: 11
+ distribution: adopt
  - name: Coverage and Sonar
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -93,10 +95,9 @@ jobs:
  path: ~/.m2/repository
  key: maven-java-11
  - uses: actions/checkout@v2
- - name: Install JDK 11 (OpenJDK)
- uses: AdoptOpenJDK/install-jdk@v1
+ - uses: actions/setup-java@v2
  with:
- version: 11
- source: releases
+ java-version: 11
+ distribution: adopt
  - name: Compatibility Check
  run: mvn -s .build/maven-ci-settings.xml -pl '!bom' -B install revapi:check@check-compatibility -DskipTests -fae
diff --git a/.github/workflows/build-pull.yml b/.github/workflows/build-pull.yml
@@ -11,7 +11,8 @@ jobs:
  java: [
  { 'version': '8', 'source': 'releases', opts: '' },
  { 'version': '11', 'source': 'releases', opts: '' },
- { 'version': '16', 'source': 'nightly', 'opts': '--illegal-access=permit' } # required for kotlin on java 16
+ { 'version': '16', 'source': 'nightly', 'opts': '--illegal-access=permit' }, # required for kotlin on java 16
+ { 'version': '17-ea', 'opts': '--illegal-access=permit' } # required for kotlin on java 17
  ]
  name: Build with Java ${{ matrix.java.version }}
  steps:
@@ -20,11 +21,11 @@ jobs:
  path: ~/.m2/repository
  key: maven-java-${{ matrix.java.version }}
  - uses: actions/checkout@v2
- - name: Install JDK ${{ matrix.java.version }} (OpenJDK)
- uses: AdoptOpenJDK/install-jdk@v1
+ - uses: actions/setup-java@v2
+ name: set up jdk ${{matrix.java.version}}
  with:
- version: ${{ matrix.java.version }}
- source: ${{ matrix.java.source }}
+ distribution: adopt
+ java-version: ${{matrix.java.version}}
  - name: Build with Maven
  env:
  MAVEN_OPTS: ${{ matrix.java.opts }}
@@ -40,10 +41,9 @@ jobs:
  path: ~/.m2/repository
  key: maven-java-11
  - uses: actions/checkout@v2
- - name: Install JDK 11 (OpenJDK)
- uses: AdoptOpenJDK/install-jdk@v1
+ - uses: actions/setup-java@v2
  with:
- version: 11
- source: releases
+ java-version: 11
+ distribution: adopt
  - name: Compatibility Check
  run: mvn -s .build/maven-ci-settings.xml -pl '!bom' -B install revapi:check@check-compatibility -DskipTests -fae
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -21,9 +21,10 @@ jobs:
  ref: ${{ github.event.ref }}
  token: ${{ secrets.GITHUB_API_TOKEN }}
  - name: Install JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v2
  with:
- version: 11
+ java-version: 11
+ distribution: adopt
  - name: 'Deploy'
  env:
  GITHUB_CONTEXT: ${{ toJson(github) }}

diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
@@ -20,9 +20,10 @@ jobs:
  ref: ${{ github.event.ref }}
  token: ${{ secrets.GITHUB_API_TOKEN }}
  - name: Install JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v2
  with:
- version: 11
+ java-version: 11
+ distribution: adopt
  - name: 'Setup Ruby'
  uses: ruby/setup-ruby@v1
  with:

diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
@@ -20,9 +20,10 @@ jobs:
  ref: ${{ github.event.ref }}
  token: ${{ secrets.GITHUB_API_TOKEN }}
  - name: Install JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v2
  with:
- version: 11
+ java-version: 11
+ distribution: adopt
  - name: 'Collect Compatibility Justification'
  env:
  GITHUB_CONTEXT: ${{ toJson(github) }}

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -36,9 +36,10 @@ jobs:
  ref: ${{ github.event.inputs.branch }}
  token: ${{ secrets.GITHUB_API_TOKEN }}
  - name: Install JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v2
  with:
- version: 11
+ java-version: 11
+ distribution: adopt
  - name: 'Prepare'
  env:
  GITHUB_CONTEXT: ${{ toJson(github) }}