Skip to content

Commit

Permalink
Adapt main to Quarkus 999-SNAPSHOT
Browse files Browse the repository at this point in the history
This change is caused by quarkusio/quarkus#19875 which as far I understood, it's not going to be reverted or fixed.

Guides updates in quarkusio/quarkus#19995
  • Loading branch information
Sgitario committed Sep 8, 2021
1 parent 880ec43 commit aab9b72
Showing 10 changed files with 98 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .github/quarkus-ecosystem-test
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
set -e

# run the tests on JVM
mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -P $MAVEN_PROFILES -Dquarkus.platform.version=999-SNAPSHOT
mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -P $MAVEN_PROFILES

# run the tests on Native
mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -P $MAVEN_PROFILES -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=5g -Dquarkus.platform.version=999-SNAPSHOT
mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -P $MAVEN_PROFILES -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=5g
112 changes: 83 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,41 @@ name: "Pull Request CI"
on:
- pull_request
jobs:
build-dependencies:
name: Build Dependencies
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 11 ]
steps:
- uses: actions/checkout@v1
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Install JDK {{ matrix.java }}
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
with:
java-version: ${{ matrix.java }}
- name: Build Quarkus main
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly
- name: Tar Maven Repo
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
- name: Persist Maven Repo
uses: actions/upload-artifact@v1
with:
name: maven-repo
path: maven-repo.tgz
linux-validate-format:
name: Linux - Validate format
runs-on: ubuntu-latest
needs: build-dependencies
strategy:
matrix:
java: [ 11 ]
@@ -20,13 +52,21 @@ jobs:
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
with:
java-version: ${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v1
with:
name: maven-repo
path: .
- name: Extract Maven Repo
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Build with Maven
run: |
mvn -V -B -s .github/mvn-settings.xml verify -Dall-modules -Dvalidate-format -DskipTests -DskipITs
linux-build-jvm-released:
name: PR - Linux - JVM build - Released Version
linux-build-jvm-latest:
name: PR - Linux - JVM build - Latest Version
runs-on: ubuntu-latest
needs: linux-validate-format
needs: [ build-dependencies, linux-validate-format ]
strategy:
matrix:
java: [ 11 ]
@@ -45,36 +85,39 @@ jobs:
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
with:
java-version: openjdk${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v1
with:
name: maven-repo
path: .
- name: Extract Maven Repo
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Build Quarkus CLI
run: |
git clone https://github.com/quarkusio/quarkus.git
cd quarkus
git checkout 2.2
mvn versions:set -DnewVersion=2.2.2.Final -DgenerateBackupPoms=false -pl .,build-parent,devtools/cli
cd devtools/cli
mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly
- name: Install Quarkus CLI
run: |
cat <<EOF > ./quarkus-dev-cli
#!/bin/bash
java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-2.2.2.Final-runner.jar "\$@"
java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-999-SNAPSHOT-runner.jar "\$@"
EOF
chmod +x ./quarkus-dev-cli
- name: Build with Maven
run: mvn -fae -V -B -s .github/mvn-settings.xml clean verify -Dall-modules -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
- name: Zip Artifacts
if: failure()
run: |
zip -R artifacts-released-linux-jvm${{ matrix.java }}.zip '*-reports/*'
zip -R artifacts-latest-linux-jvm${{ matrix.java }}.zip '*-reports/*'
- uses: actions/upload-artifact@v1
if: failure()
with:
name: ci-artifacts
path: artifacts-released-linux-jvm${{ matrix.java }}.zip
linux-build-native-released:
name: PR - Linux - Native build - Released Version
path: artifacts-latest-linux-jvm${{ matrix.java }}.zip
linux-build-native-latest:
name: PR - Linux - Native build - Latest Version
runs-on: ubuntu-latest
needs: linux-validate-format
needs: [ build-dependencies, linux-validate-format ]
strategy:
matrix:
java: [ 11 ]
@@ -93,19 +136,22 @@ jobs:
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
with:
java-version: openjdk${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v1
with:
name: maven-repo
path: .
- name: Extract Maven Repo
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Build Quarkus CLI
run: |
git clone https://github.com/quarkusio/quarkus.git
cd quarkus
git checkout 2.2
mvn versions:set -DnewVersion=2.2.2.Final -DgenerateBackupPoms=false -pl .,build-parent,devtools/cli
cd devtools/cli
mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly
- name: Install Quarkus CLI
run: |
cat <<EOF > ./quarkus-dev-cli
#!/bin/bash
java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-2.2.2.Final-runner.jar "\$@"
java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-999-SNAPSHOT-runner.jar "\$@"
EOF
chmod +x ./quarkus-dev-cli
- id: files
@@ -133,16 +179,16 @@ jobs:
- name: Zip Artifacts
if: failure()
run: |
zip -R artifacts-released-linux-native${{ matrix.java }}.zip '*-reports/*'
zip -R artifacts-latest-linux-native${{ matrix.java }}.zip '*-reports/*'
- uses: actions/upload-artifact@v1
if: failure()
with:
name: ci-artifacts
path: artifacts-released-linux-native${{ matrix.java }}.zip
windows-build-jvm-released:
name: PR - Windows - JVM build - Released Version
path: artifacts-latest-linux-native${{ matrix.java }}.zip
windows-build-jvm-latest:
name: PR - Windows - JVM build - Latest Version
runs-on: windows-latest
needs: linux-validate-format
needs: [ build-dependencies, linux-validate-format ]
strategy:
matrix:
java: [ 11 ]
@@ -158,6 +204,14 @@ jobs:
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
with:
java-version: ${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v1
with:
name: maven-repo
path: .
- name: Extract Maven Repo
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Build in JVM mode
shell: bash
run: |
@@ -167,10 +221,10 @@ jobs:
if: failure()
run: |
# Disambiguate windows find from cygwin find
/usr/bin/find . -name '*-reports/*' -type d | tar -czf artifacts-released-windows-jvm${{ matrix.java }}.tar -T -
/usr/bin/find . -name '*-reports/*' -type d | tar -czf artifacts-latest-windows-jvm${{ matrix.java }}.tar -T -
- name: Archive artifacts
if: failure()
uses: actions/upload-artifact@v1
with:
name: ci-artifacts
path: artifacts-released-windows-jvm${{ matrix.java }}.tar
path: artifacts-latest-windows-jvm${{ matrix.java }}.tar
8 changes: 4 additions & 4 deletions .github/workflows/daily.yaml
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ jobs:
chmod +x ./quarkus-dev-cli
- name: Test in JVM mode
run: |
mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -Dall-modules -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli" -Dquarkus.platform.version=999-SNAPSHOT
mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -Dall-modules -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
- name: Zip Artifacts
if: failure()
run: |
@@ -134,7 +134,7 @@ jobs:
chmod +x ./quarkus-dev-cli
- name: Test in Native mode
run: |
mvn -fae -V -B -s .github/mvn-settings.xml -P ${{ matrix.profiles }} -fae clean verify -Dquarkus.platform.version=999-SNAPSHOT -Dnative \
mvn -fae -V -B -s .github/mvn-settings.xml -P ${{ matrix.profiles }} -fae clean verify -Dnative \
-Dquarkus.native.builder-image=quay.io/quarkus/${{ matrix.image }} \
-Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
- name: Zip Artifacts
@@ -177,7 +177,7 @@ jobs:
- name: Build in JVM mode
shell: bash
run: |
mvn -fae -s .github/mvn-settings.xml clean verify -Dquarkus.platform.version=999-SNAPSHOT
mvn -fae -s .github/mvn-settings.xml clean verify
- name: Zip Artifacts
shell: bash
if: failure()
@@ -237,7 +237,7 @@ jobs:
shell: bash
run: |
# Running only http/http-minimum as after some time, it gives disk full in Windows when running on Native.
mvn -fae -s .github/mvn-settings.xml clean verify -Dall-modules -Dquarkus.platform.version=999-SNAPSHOT -Dnative -Dquarkus.native.container-build=false -pl http/http-minimum
mvn -fae -s .github/mvn-settings.xml clean verify -Dall-modules -Dnative -Dquarkus.native.container-build=false -pl http/http-minimum
- name: Zip Artifacts
shell: bash
if: failure()
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<failsafe-plugin.version>2.22.2</failsafe-plugin.version>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>2.2.2.Final</quarkus.platform.version>
<quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
<quarkus-plugin.version>${quarkus.platform.version}</quarkus-plugin.version>
<quarkus.qe.framework.version>0.0.8</quarkus.qe.framework.version>
<quarkus-qpid-jms.version>0.27.0</quarkus-qpid-jms.version>
2 changes: 1 addition & 1 deletion scheduling/quartz/pom.xml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson</artifactId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
6 changes: 1 addition & 5 deletions spring/spring-data/pom.xml
Original file line number Diff line number Diff line change
@@ -11,10 +11,6 @@
<packaging>jar</packaging>
<name>Quarkus QE TS: Spring: Spring Data</name>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-undertow</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-di</artifactId>
@@ -33,7 +29,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson</artifactId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@
import org.junit.jupiter.api.Test;

import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot;
import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusVersion;
import io.quarkus.ts.spring.data.AbstractDbIT;
import io.restassured.http.Headers;
import io.restassured.response.Response;
@@ -63,6 +65,8 @@ public void testRequestScope() {
//This is for regression test for https://github.com/quarkusio/quarkus/pull/12234
@Test
@DisplayName("session scope")
@DisabledOnQuarkusVersion(version = "2.3.*", reason = "quarkus-spring-data-rest is now reactive")
@DisabledOnQuarkusSnapshot(reason = "quarkus-spring-data-rest is now reactive")
public void testSessionScope() {
final Response first = app.given().get("/cat/customFindDistinctivePrimitive/2");
final String sessionId = first.sessionId();
2 changes: 1 addition & 1 deletion sql-db/panache-flyway/pom.xml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson</artifactId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Original file line number Diff line number Diff line change
@@ -3,13 +3,10 @@
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.is;

import javax.ws.rs.core.MediaType;

import org.apache.http.HttpStatus;
import org.junit.jupiter.api.Test;

import io.quarkus.test.scenarios.QuarkusScenario;
import io.restassured.http.ContentType;
import io.restassured.specification.RequestSpecification;

@QuarkusScenario
@@ -27,6 +24,6 @@ public void shouldDataSourceBeProperlyConfigured() {
}

private static final RequestSpecification dataSourcePath() {
return given().accept(MediaType.APPLICATION_JSON).contentType(ContentType.JSON).when().basePath(DATA_SOURCE_PATH);
return given().when().basePath(DATA_SOURCE_PATH);
}
}

0 comments on commit aab9b72

Please sign in to comment.