Skip to content

Commit

Permalink
Fix using of inactive datasource in Reactive Vanilla module
Browse files Browse the repository at this point in the history
  • Loading branch information
@michalvavrik
michalvavrik committed Oct 21, 2024
1 parent 57d38fe commit c73eccc
Show file tree
Hide file tree
Showing 48 changed files with 835 additions and 860 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/pr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,13 @@ jobs:
java-version: ${{ matrix.java }}
check-latest: true
cache: 'maven'
- name: Set up Maven settings.xml # we need to do this because of CLI and external app tests does not propagate '-s' option
shell: bash
run: cp .github/quarkus-snapshots-mvn-settings.xml ~/.m2/settings.xml
- name: Build in JVM mode
shell: bash
run: |
mvn -B --no-transfer-progress -fae -s .github/quarkus-snapshots-mvn-settings.xml clean install -Pframework,examples -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
mvn -B --no-transfer-progress -fae clean install -Pframework,examples -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
- name: Detect flaky tests
shell: bash
id: flaky-test-detector
Expand Down
11 changes: 11 additions & 0 deletions checkstyle-suppressions.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">

<suppressions>
<suppress checks="LineLength"
files="PreparePomMojo.java"
lines="31"/>
</suppressions>
16 changes: 0 additions & 16 deletions examples/amq-amqp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
16 changes: 0 additions & 16 deletions examples/amq-tcp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
31 changes: 0 additions & 31 deletions examples/blocking-reactive-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
</parent>
<artifactId>examples-blocking-reactive</artifactId>
<name>Quarkus - Test Framework - Examples - Blocking + Reactive Model</name>
<properties>
<!-- Skip build since our framework will build own executable anyway as it detects build-time properties -->
<quarkus.build.skip>true</quarkus.build.skip>
</properties>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
Expand All @@ -38,31 +34,4 @@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>deploy-to-openshift-using-extension</id>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-openshift</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
39 changes: 0 additions & 39 deletions examples/consul/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,43 +40,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>deploy-to-openshift-using-extension</id>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-openshift</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>skip-build-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<!-- Skip build to see if we still experience race on Windows -->
<quarkus.build.skip>true</quarkus.build.skip>
</properties>
</profile>
</profiles>
</project>
16 changes: 0 additions & 16 deletions examples/database-mysql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
16 changes: 0 additions & 16 deletions examples/database-oracle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
16 changes: 0 additions & 16 deletions examples/database-postgresql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
26 changes: 0 additions & 26 deletions examples/debug/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,6 @@
<escapeString>\</escapeString>
</configuration>
</plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<!-- Skipped Quarkus build in native as there is nothing to compile or test -->
<quarkus.build.skip>true</quarkus.build.skip>
</properties>
</profile>
</profiles>
</project>
16 changes: 0 additions & 16 deletions examples/debug/src/test/resources-filtered/project/classic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
20 changes: 0 additions & 20 deletions examples/funqy-knative-events/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<artifactId>examples-funqy-knative-events</artifactId>
<packaging>jar</packaging>
<name>Quarkus - Test Framework - Examples - Funqy - Knative Events</name>
<properties>
<!-- Skip Quarkus build as this module have only Openshift tests and app have fixed build time properties -->
<quarkus.build.skip>true</quarkus.build.skip>
</properties>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
Expand All @@ -37,20 +33,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
16 changes: 0 additions & 16 deletions examples/greetings/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
11 changes: 0 additions & 11 deletions examples/grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,4 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>deploy-to-openshift-using-extension</id>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-openshift</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
16 changes: 0 additions & 16 deletions examples/https/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,6 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
Expand Down
27 changes: 0 additions & 27 deletions examples/infinispan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>deploy-to-openshift-using-extension</id>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-openshift</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
Loading

0 comments on commit c73eccc

Please sign in to comment.