diff --git a/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml b/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml index 6629fb3f642b0..aa989a4f2c630 100644 --- a/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml +++ b/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml @@ -13,11 +13,6 @@ Quarkus - Integration Tests - Hibernate Reactive - MySQL - With Agroal and Flyway Hibernate Reactive related tests running with the MySQL database and also using Agroal and Flyway - - vertx-reactive:mysql://localhost:3308/hibernate_orm_test?allowPublicKeyRetrieval=true - jdbc:mysql://localhost:3308/hibernate_orm_test - - io.quarkus @@ -206,106 +201,6 @@ - - - docker-mysql - - - start-containers - - - - - - io.fabric8 - docker-maven-plugin - - - - healthcheck-${mysql.image} - quarkus-test-mysql - - ${mysql.image} - - - 5s - 3s - 5s - 5 - - - mysqladmin ping -h localhost -u hibernate_orm_test -phibernate_orm_test || exit 1 - - - - - - 3308:3306 - - - hibernate_orm_test - hibernate_orm_test - hibernate_orm_test - true - - - MySQL: - default - cyan - - - /var/lib/mysql - - - - true - - - - - - true - - - - docker-start - compile - - stop - build - start - - - - docker-stop - post-integration-test - - stop - - - - - - org.codehaus.mojo - exec-maven-plugin - - - docker-prune - generate-resources - - exec - - - ${docker-prune.location} - - - - - - - diff --git a/integration-tests/hibernate-reactive-mysql-agroal-flyway/src/main/resources/application.properties b/integration-tests/hibernate-reactive-mysql-agroal-flyway/src/main/resources/application.properties index 540522a268d51..b9ff7cb189178 100644 --- a/integration-tests/hibernate-reactive-mysql-agroal-flyway/src/main/resources/application.properties +++ b/integration-tests/hibernate-reactive-mysql-agroal-flyway/src/main/resources/application.properties @@ -1,9 +1,5 @@ # Reactive+JDBC datasource config quarkus.datasource.db-kind=mysql -quarkus.datasource.username=hibernate_orm_test -quarkus.datasource.password=hibernate_orm_test -quarkus.datasource.reactive.url=${reactive-mysql.url} -quarkus.datasource.jdbc.url=${mysql.jdbc.url} quarkus.datasource.jdbc.max-size=1 # Hibernate config diff --git a/integration-tests/hibernate-reactive-mysql/pom.xml b/integration-tests/hibernate-reactive-mysql/pom.xml index 60e602030bfc9..4028293dd7ea9 100644 --- a/integration-tests/hibernate-reactive-mysql/pom.xml +++ b/integration-tests/hibernate-reactive-mysql/pom.xml @@ -13,10 +13,6 @@ Quarkus - Integration Tests - Hibernate Reactive - MySQL Hibernate Reactive related tests running with the MySQL database - - vertx-reactive:mysql://localhost:3308/hibernate_orm_test?allowPublicKeyRetrieval=true - - io.quarkus @@ -152,106 +148,6 @@ - - - docker-mysql - - - start-containers - - - - - - io.fabric8 - docker-maven-plugin - - - - healthcheck-${mysql.image} - quarkus-test-mysql - - ${mysql.image} - - - 5s - 3s - 5s - 5 - - - mysqladmin ping -h localhost -u hibernate_orm_test -phibernate_orm_test || exit 1 - - - - - - 3308:3306 - - - hibernate_orm_test - hibernate_orm_test - hibernate_orm_test - true - - - MySQL: - default - cyan - - - /var/lib/mysql - - - - true - - - - - - true - - - - docker-start - compile - - stop - build - start - - - - docker-stop - post-integration-test - - stop - - - - - - org.codehaus.mojo - exec-maven-plugin - - - docker-prune - generate-resources - - exec - - - ${docker-prune.location} - - - - - - - diff --git a/integration-tests/hibernate-reactive-mysql/src/main/resources/application.properties b/integration-tests/hibernate-reactive-mysql/src/main/resources/application.properties index 1ab5cd470511a..7cf13ec86ecd4 100644 --- a/integration-tests/hibernate-reactive-mysql/src/main/resources/application.properties +++ b/integration-tests/hibernate-reactive-mysql/src/main/resources/application.properties @@ -1,6 +1,4 @@ quarkus.datasource.db-kind=mysql -quarkus.datasource.username=hibernate_orm_test -quarkus.datasource.password=hibernate_orm_test # Hibernate config #quarkus.hibernate-orm.log.sql=true @@ -8,4 +6,3 @@ quarkus.hibernate-orm.schema-management.strategy=drop-and-create # Reactive config quarkus.datasource.reactive=true -quarkus.datasource.reactive.url=${reactive-mysql.url} diff --git a/integration-tests/jpa-mysql/README.md b/integration-tests/jpa-mysql/README.md index 8506a45610144..66091053a253b 100644 --- a/integration-tests/jpa-mysql/README.md +++ b/integration-tests/jpa-mysql/README.md @@ -4,7 +4,7 @@ By default, the tests of this module are disabled. -To run the tests in a standard JVM with MySQL started as a Docker container, you can run the following command: +To run the tests in a standard JVM with MySQL started as a Dev Service, you can run the following command: ``` mvn clean install -Dtest-containers -Dstart-containers @@ -19,9 +19,9 @@ Additionally, you can generate a native image and run the tests for this native mvn clean install -Dtest-containers -Dstart-containers -Dnative ``` -If you don't want to run MySQL as a Docker container, you can start your own MySQLDB server. It needs to listen on the default port and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`. +If you don't want to run MySQL as a Dev Service, you can start your own MySQLDB server. It needs to listen on the default port and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`. -You can then run the tests as follows (either with `-Dnative` or not): +You can then run the tests as follows (either with `-Dnative` or not), with extra configuration for the connection url: ``` mvn clean install -Dtest-containers diff --git a/integration-tests/jpa-mysql/pom.xml b/integration-tests/jpa-mysql/pom.xml index 023e1ae9973d4..2e31d5d98579b 100644 --- a/integration-tests/jpa-mysql/pom.xml +++ b/integration-tests/jpa-mysql/pom.xml @@ -13,10 +13,6 @@ Quarkus - Integration Tests - JPA - MySQL Module that contains JPA related tests running with the MySQL database - - jdbc:mysql://localhost:3306/hibernate_orm_test?allowPublicKeyRetrieval=true - - io.quarkus @@ -155,109 +151,6 @@ - - docker-mysql - - - start-containers - - - - jdbc:mysql://localhost:3306/hibernate_orm_test?allowPublicKeyRetrieval=true - - - - - io.fabric8 - docker-maven-plugin - - - - healthcheck-${mysql.image} - quarkus-test-mysql - - ${mysql.image} - - - 5s - 3s - 5s - 5 - - - mysqladmin ping -h localhost -u hibernate_orm_test -phibernate_orm_test || exit 1 - - - - - - - 3306:3306 - - - hibernate_orm_test - hibernate_orm_test - hibernate_orm_test - true - - - MySQL: - default - cyan - - - /var/lib/mysql - - - - true - - - - - - true - - - - docker-start - compile - - stop - build - start - - - - docker-stop - post-integration-test - - stop - - - - - - org.codehaus.mojo - exec-maven-plugin - - - docker-prune - generate-resources - - exec - - - ${docker-prune.location} - - - - - - - podman @@ -272,17 +165,6 @@ true true - - - - io.fabric8 - docker-maven-plugin - - true - - - - diff --git a/integration-tests/jpa-mysql/src/main/resources/application.properties b/integration-tests/jpa-mysql/src/main/resources/application.properties index a993f63645d14..7b23b0155feb5 100644 --- a/integration-tests/jpa-mysql/src/main/resources/application.properties +++ b/integration-tests/jpa-mysql/src/main/resources/application.properties @@ -1,14 +1,8 @@ quarkus.datasource.db-kind=mysql -quarkus.datasource.username=hibernate_orm_test -quarkus.datasource.password=hibernate_orm_test -quarkus.datasource.jdbc.url=${mysql.url} quarkus.datasource.jdbc.max-size=1 quarkus.datasource.jdbc.transactions=enabled quarkus.datasource.samebutxa.db-kind=mysql -quarkus.datasource.samebutxa.username=hibernate_orm_test -quarkus.datasource.samebutxa.password=hibernate_orm_test -quarkus.datasource.samebutxa.jdbc.url=${mysql.url} quarkus.datasource.samebutxa.jdbc.max-size=1 quarkus.datasource.samebutxa.jdbc.transactions=xa diff --git a/integration-tests/reactive-mysql-client/README.md b/integration-tests/reactive-mysql-client/README.md index 18cc41c5c46d4..8e09118eb0fa6 100644 --- a/integration-tests/reactive-mysql-client/README.md +++ b/integration-tests/reactive-mysql-client/README.md @@ -4,7 +4,7 @@ By default, the tests of this module are disabled. -To run the tests in a standard JVM with MariaDB started as a Docker container, you can run the following command: +To run the tests in a standard JVM with MariaDB started as a Dev Service, you can run the following command: ``` mvn clean install -Dtest-containers -Dstart-containers @@ -16,7 +16,7 @@ Additionally, you can generate a native image and run the tests for this native mvn clean install -Dtest-containers -Dstart-containers -Dnative ``` -If you don't want to run MariaDB as a Docker container, you can start your own MariaDB or MySQL server. It needs to listen on port 3308 and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`. +If you don't want to run MariaDB as a Dev Service, you can start your own MariaDB or MySQL server. It needs to listen on port 3308 and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`. You can then run the tests as follows (either with `-Dnative` or not): diff --git a/integration-tests/reactive-mysql-client/pom.xml b/integration-tests/reactive-mysql-client/pom.xml index 7784ff20bfd7a..f25fd847d1edb 100644 --- a/integration-tests/reactive-mysql-client/pom.xml +++ b/integration-tests/reactive-mysql-client/pom.xml @@ -30,10 +30,6 @@ Quarkus - Integration Tests - Reactive MySQL Client - - vertx-reactive:mysql://localhost:3308/hibernate_orm_test - - io.quarkus @@ -160,116 +156,6 @@ - - - docker-mariadb - - - start-containers - - - - - - io.fabric8 - docker-maven-plugin - - - - healthcheck-${mariadb.image} - quarkus-test-mariadb - - ${mariadb.image} - - - 5s - 3s - 5s - 5 - - - mysqladmin ping -h localhost -u root -psecret|| exit 1 - - - - - - bridge - - - 3308:3306 - - - hibernate_orm_test - hibernate_orm_test - hibernate_orm_test - true - - - MariaDB: - default - cyan - - - /var/lib/mysql - - - - true - - - - - ${project.basedir}/custom-mariadbconfig:/etc/mysql/conf.d${volume.access.modifier} - - - - - - - - true - - - - docker-start - compile - - stop - build - start - - - - docker-stop - post-integration-test - - stop - - - - - - org.codehaus.mojo - exec-maven-plugin - - - docker-prune - generate-resources - - exec - - - ${docker-prune.location} - - - - - - - diff --git a/integration-tests/reactive-mysql-client/src/main/resources/application.properties b/integration-tests/reactive-mysql-client/src/main/resources/application.properties index 9bca423c38593..5609a4d1367e9 100644 --- a/integration-tests/reactive-mysql-client/src/main/resources/application.properties +++ b/integration-tests/reactive-mysql-client/src/main/resources/application.properties @@ -1,4 +1,2 @@ quarkus.datasource.db-kind=mysql -quarkus.datasource.username=hibernate_orm_test -quarkus.datasource.password=hibernate_orm_test -quarkus.datasource.reactive.url=${reactive-mysql.url} +