This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 062d113 Use JDK 17 in alternative JVM jobs
062d113 is described below
commit 062d113bed33f41bdd2f5827e29b88e71ae46713
Author: James Netherton <[email protected]>
AuthorDate: Wed Oct 20 11:50:46 2021 +0100
Use JDK 17 in alternative JVM jobs
---
.github/workflows/camel-master-cron.yaml | 15 ++++++----
.github/workflows/ci-build.yaml | 42 ++++++++++++++-------------
.github/workflows/generate-jvm-extension.yaml | 5 ++--
.github/workflows/pr-validate.yml | 5 ++--
.github/workflows/quarkus-master-cron.yaml | 15 ++++++----
pom.xml | 2 +-
6 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml
b/.github/workflows/camel-master-cron.yaml
index 0de869d..0b5894c 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -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"
@@ -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:
@@ -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:
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 48e30fd..aa30015 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -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: |
@@ -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:
@@ -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:
@@ -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:
@@ -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
@@ -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:
@@ -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:
@@ -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:
@@ -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:
diff --git a/.github/workflows/generate-jvm-extension.yaml
b/.github/workflows/generate-jvm-extension.yaml
index a71a955..70a1575 100644
--- a/.github/workflows/generate-jvm-extension.yaml
+++ b/.github/workflows/generate-jvm-extension.yaml
@@ -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"
diff --git a/.github/workflows/pr-validate.yml
b/.github/workflows/pr-validate.yml
index fc57395..256f67a 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -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 \
diff --git a/.github/workflows/quarkus-master-cron.yaml
b/.github/workflows/quarkus-master-cron.yaml
index 6850cb4..dccad54 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -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"
@@ -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:
@@ -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:
diff --git a/pom.xml b/pom.xml
index c82fdc2..55ee385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,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>
