diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DB2DatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DB2DatabaseIT.java index 23c8e853c..1e7142675 100644 --- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DB2DatabaseIT.java +++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DB2DatabaseIT.java @@ -18,8 +18,8 @@ public class DB2DatabaseIT extends AbstractSqlDatabaseIT { @Container(image = "${db2.image}", port = 50000, expectedLog = "Setup has completed") static Db2Service db2 = new Db2Service(); - @QuarkusApplication - static RestService app = new RestService().withProperties("db2_app.properties") + @QuarkusApplication(properties = "db2_app.properties") + static RestService app = new RestService() .withProperty("quarkus.datasource.username", db2.getUser()) .withProperty("quarkus.datasource.password", db2.getPassword()) .withProperty("quarkus.datasource.jdbc.url", db2::getJdbcUrl); diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MariaDBDatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MariaDBDatabaseIT.java index 3a0619360..a98bd75f8 100644 --- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MariaDBDatabaseIT.java +++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MariaDBDatabaseIT.java @@ -15,8 +15,8 @@ public class MariaDBDatabaseIT extends AbstractSqlDatabaseIT { + MARIADB_PORT) static MariaDbService database = new MariaDbService(); - @QuarkusApplication - static RestService app = new RestService().withProperties("mariadb_app.properties") + @QuarkusApplication(properties = "mariadb_app.properties") + static RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MssqlDatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MssqlDatabaseIT.java index 56d4d392e..590369af9 100644 --- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MssqlDatabaseIT.java +++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MssqlDatabaseIT.java @@ -23,10 +23,9 @@ public class MssqlDatabaseIT extends AbstractSqlDatabaseIT { @Dependency(groupId = "io.quarkus", artifactId = "quarkus-security"), @Dependency(groupId = "org.bouncycastle", artifactId = "bctls-fips"), @Dependency(groupId = "org.bouncycastle", artifactId = "bc-fips") - }) + }, properties = "mssql.properties") static final RestService app = new RestService() .withProperties(database::getTlsProperties) - .withProperties("mssql.properties") .withProperty("quarkus.security.security-providers", "BCFIPSJSSE") .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java index b298347a2..2d521f275 100644 --- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java +++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java @@ -14,8 +14,8 @@ public class MySqlDatabaseIT extends AbstractSqlDatabaseIT { @Container(image = "${mysql.80.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) static MySqlService database = new MySqlService(); - @QuarkusApplication - static RestService app = new RestService().withProperties("mysql.properties") + @QuarkusApplication(properties = "mysql.properties") + static RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/OracleDatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/OracleDatabaseIT.java index aa440f7d7..cf8218e3c 100644 --- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/OracleDatabaseIT.java +++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/OracleDatabaseIT.java @@ -17,8 +17,8 @@ public class OracleDatabaseIT extends AbstractSqlDatabaseIT { @Container(image = "${oracle.image}", port = ORACLE_PORT, expectedLog = "DATABASE IS READY TO USE!") static OracleService database = new OracleService(); - @QuarkusApplication - static RestService app = new RestService().withProperties("oracle.properties") + @QuarkusApplication(properties = "oracle.properties") + static RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/PostgresqlDatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/PostgresqlDatabaseIT.java index 4458003cb..3d3ca39a7 100644 --- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/PostgresqlDatabaseIT.java +++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/PostgresqlDatabaseIT.java @@ -14,8 +14,8 @@ public class PostgresqlDatabaseIT extends AbstractSqlDatabaseIT { @Container(image = "${postgresql.latest.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address") static PostgresqlService database = new PostgresqlService(); - @QuarkusApplication - static RestService app = new RestService().withProperties("postgresql.properties") + @QuarkusApplication(properties = "postgresql.properties") + static RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl);