This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 346243916ea8d12f881e77cd7a0a15319f7d3411 Author: lburgazzoli <[email protected]> AuthorDate: Wed Apr 1 14:17:58 2020 +0200 Set Java 11 as default --- .github/workflows/pr-build.yaml | 17 +++++++++-------- .github/workflows/pr-validate.yml | 6 +++--- pom.xml | 11 ++++++++++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 67afc45..52b8179 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -44,10 +44,10 @@ jobs: echo '::set-env name=BRANCH_OPTIONS::-Psnapshots' - name: Checkout uses: actions/checkout@v2 - - name: Set Up Java - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: joschi/setup-jdk@v1 with: - java-version: 1.8 + java-version: 11 - name: Build Project run: | ./mvnw -V -ntp ${BRANCH_OPTIONS} \ @@ -64,7 +64,7 @@ jobs: needs: build strategy: matrix: - java: [ '11' , '12' ] + java: [ '8' , '12' ] env: MAVEN_OPTS: -Xmx3000m steps: @@ -74,7 +74,7 @@ jobs: echo '::set-env name=BRANCH_OPTIONS::-Psnapshots' - uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: joschi/setup-jdk@v1 with: java-version: ${{ matrix.java }} - name: Restore Cache @@ -147,6 +147,7 @@ jobs: - category: Memoryhog XML test-modules: > xml + rest-binding-mode-xml - category: Messaging test-modules: > activemq @@ -207,10 +208,10 @@ jobs: echo '::set-env name=BRANCH_OPTIONS::-Psnapshots' - name: Checkout uses: actions/checkout@v2 - - name: Set Up Java - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: joschi/setup-jdk@v1 with: - java-version: 1.8 + java-version: 11 - name: Restore Cache uses: actions/cache@v1 with: diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml index b29cebc..dd116bc 100644 --- a/.github/workflows/pr-validate.yml +++ b/.github/workflows/pr-validate.yml @@ -41,10 +41,10 @@ jobs: run: | echo '::set-env name=BRANCH_OPTIONS::-Psnapshots' - uses: actions/checkout@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: joschi/setup-jdk@v1 with: - java-version: 1.8 + java-version: 11 - name: mvn validate run: | ./mvnw ${BRANCH_OPTIONS} -fae -ntp \ diff --git a/pom.xml b/pom.xml index 5fc8ab2..216bf4c 100644 --- a/pom.xml +++ b/pom.xml @@ -785,13 +785,22 @@ </property> </activation> <properties> - <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:19.3.1-java8</quarkus.native.builder-image> <quarkus.native.container-build>true</quarkus.native.container-build> <quarkus.native.container-runtime>docker</quarkus.native.container-runtime> </properties> </profile> <profile> + <id>docker-java8</id> + <activation> + <jdk>1.8</jdk> + </activation> + <properties> + <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:19.3.1-java8</quarkus.native.builder-image> + </properties> + </profile> + + <profile> <id>snapshots</id> <activation> <activeByDefault>false</activeByDefault>
