Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use JDK 17 in alternative JVM jobs #3212

Merged
merged 1 commit into from
Oct 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/camel-master-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ jobs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
steps:
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Clean VM
run: |
echo "Removing unwanted SDKs"
Expand Down Expand Up @@ -107,9 +108,10 @@ jobs:
matrix: ${{ fromJson(needs.initial-mvn-install.outputs.matrix) }}
steps:
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -177,9 +179,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down
42 changes: 22 additions & 20 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ jobs:
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT" >> $GITHUB_ENV
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Build Quarkus
if: github.ref == 'refs/heads/quarkus-main' || github.base_ref == 'quarkus-main'
run: |
Expand Down Expand Up @@ -136,9 +137,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -198,8 +200,6 @@ jobs:
if: github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'JVM')
strategy:
fail-fast: false
matrix:
java: [ '11' ]
env:
MAVEN_OPTS: -Xmx3000m
steps:
Expand All @@ -212,10 +212,11 @@ jobs:
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT" >> $GITHUB_ENV
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: AdoptOpenJDK/install-jdk@v1
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
version: ${{ matrix.java }}
distribution: 'temurin'
java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -253,12 +254,12 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '11', '16' ]
java: [ '11', '17' ]
env:
MAVEN_OPTS: -Xmx3000m
steps:
- name: Setup jdk.compiler options for Kotlin Kapt
if: matrix.java == '16'
if: matrix.java == '17'
run: |
# Set additional options for Kotlin Kapt
# https://youtrack.jetbrains.com/issue/KT-43704
Expand All @@ -273,9 +274,10 @@ jobs:
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT" >> $GITHUB_ENV
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: ${{ matrix.java }}
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -308,8 +310,6 @@ jobs:
if: github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'JVM')
strategy:
fail-fast: false
matrix:
java: [ '16' ]
env:
MAVEN_OPTS: -Xmx3000m
steps:
Expand All @@ -330,10 +330,11 @@ jobs:
rm -rf /usr/local/go \
rm -rf /usr/share/dotnet \
rm -rf /usr/share/rust
- name: Set up JDK ${{ matrix.java }}
uses: AdoptOpenJDK/install-jdk@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
version: ${{ matrix.java }}
distribution: 'temurin'
java-version: '17'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -369,9 +370,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: 11
distribution: 'temurin'
java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/generate-jvm-extension.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Generate JVM Extensions
id: generate
if: ${{ steps.generate.outputs.extensions-added }} == "true"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/pr-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ jobs:
echo "BRANCH_OPTIONS=-Poss-snapshots" >> $GITHUB_ENV
- uses: actions/checkout@v1
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: mvn validate
run: |
./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} -fae \
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/quarkus-master-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ jobs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
steps:
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Clean VM
run: |
echo "Removing unwanted SDKs"
Expand Down Expand Up @@ -116,9 +117,10 @@ jobs:
matrix: ${{ fromJson(needs.initial-mvn-install.outputs.matrix) }}
steps:
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -186,9 +188,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
uses: actions/setup-java@v2
with:
version: '11'
distribution: 'temurin'
java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<protobuf.version>${protobuf-version}</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.12.version>2.12.14</scala-2.12.version><!-- Spark -->
<scala-2.12.version>2.12.15</scala-2.12.version><!-- Spark -->
<smallrye.reactive.messaging.camel.version>3.10.1</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
Expand Down