Use container urls for connecting to services by default

It is better for the build cache and for local testing, nowadays, there is a good chance people will use containers anyway.
quarkusio · Oct 23, 2023 · 31a70fc · 31a70fc
1 parent d167d19
commit 31a70fc
Show file tree

Hide file tree

Showing 44 changed files with 49 additions and 152 deletions.
diff --git a/extensions/hibernate-reactive/deployment/pom.xml b/extensions/hibernate-reactive/deployment/pom.xml
@@ -12,9 +12,8 @@
     <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
     <name>Quarkus - Hibernate Reactive - Deployment</name>
 
-    <!-- Defaults, to simplify local testing -->
     <properties>
-        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
     <dependencies>
@@ -162,9 +161,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/oidc-client/deployment/pom.xml b/extensions/oidc-client/deployment/pom.xml
@@ -160,9 +160,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <keycloak.url>http://localhost:8180/auth</keycloak.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
     <artifactId>quarkus-hibernate-reactive-panache-kotlin-deployment</artifactId>
@@ -198,9 +198,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
     <artifactId>quarkus-hibernate-reactive-panache-deployment</artifactId>
@@ -141,9 +141,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/pom.xml
@@ -12,9 +12,8 @@
     <artifactId>quarkus-hibernate-reactive-rest-data-panache-deployment</artifactId>
     <name>Quarkus - Hibernate Reactive REST data with Panache - Deployment</name>
 
-    <!-- Defaults, to simplify local testing -->
     <properties>
-        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
     <dependencies>
@@ -122,9 +121,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/reactive-mssql-client/deployment/pom.xml b/extensions/reactive-mssql-client/deployment/pom.xml
@@ -15,7 +15,7 @@
     <name>Quarkus - Reactive Microsoft SQL Server Client - Deployment</name>
 
     <properties>
-        <reactive-mssql.url>vertx-reactive:sqlserver://localhost:1433</reactive-mssql.url>
+        <reactive-mssql.url>vertx-reactive:sqlserver://localhost:1435</reactive-mssql.url>
     </properties>
 
     <dependencies>
@@ -132,9 +132,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-mssql.url>vertx-reactive:sqlserver://localhost:1435</reactive-mssql.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml
@@ -32,7 +32,7 @@
     <name>Quarkus - Reactive MySQL Client - Deployment</name>
 
     <properties>
-        <reactive-mysql.url>vertx-reactive:mysql://localhost:3306/hibernate_orm_test</reactive-mysql.url>
+        <reactive-mysql.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test</reactive-mysql.url>
     </properties>
 
     <dependencies>
@@ -153,9 +153,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-mysql.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test</reactive-mysql.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/reactive-oracle-client/deployment/pom.xml b/extensions/reactive-oracle-client/deployment/pom.xml
@@ -136,9 +136,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-oracledb.url>vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1</reactive-oracledb.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/extensions/reactive-pg-client/deployment/pom.xml b/extensions/reactive-pg-client/deployment/pom.xml
@@ -15,7 +15,7 @@
     <name>Quarkus - Reactive PostgreSQL Client - Deployment</name>
 
     <properties>
-        <reactive-postgres.url>vertx-reactive:postgresql:///hibernate_orm_test</reactive-postgres.url>
+        <reactive-postgres.url>vertx-reactive:postgresql://:5431/hibernate_orm_test</reactive-postgres.url>
     </properties>
 
     <dependencies>
@@ -133,9 +133,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-postgres.url>vertx-reactive:postgresql://:5431/hibernate_orm_test</reactive-postgres.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-orm-compatibility-5.6/mariadb/pom.xml b/integration-tests/hibernate-orm-compatibility-5.6/mariadb/pom.xml
@@ -14,7 +14,7 @@
     <name>Quarkus - Integration Tests - Hibernate ORM - Compatibility with databases meant for ORM 5.6 - MariaDB</name>
 
     <properties>
-        <mariadb.url>jdbc:mariadb://localhost:3306/hibernate_orm_test</mariadb.url>
+        <mariadb.url>jdbc:mariadb://localhost:3308/hibernate_orm_test</mariadb.url>
         <!-- We test features in Hibernate ORM that are timezone-sensitive, e.g. ZoneOffsetDateTime normalization -->
         <surefire.argLine.additional>-Duser.timezone=Europe/Paris</surefire.argLine.additional>
     </properties>
@@ -197,9 +197,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <mariadb.url>jdbc:mariadb://localhost:3308/hibernate_orm_test</mariadb.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-orm-compatibility-5.6/postgresql/pom.xml b/integration-tests/hibernate-orm-compatibility-5.6/postgresql/pom.xml
@@ -14,6 +14,7 @@
     <name>Quarkus - Integration Tests - Hibernate ORM - Compatibility with databases meant for ORM 5.6 - PostgreSQL</name>
 
     <properties>
+        <postgres.url>jdbc:postgresql://localhost:5431/hibernate_orm_test</postgres.url>
         <!-- We test features in Hibernate ORM that are timezone-sensitive, e.g. ZoneOffsetDateTime normalization -->
         <surefire.argLine.additional>-Duser.timezone=Europe/Paris</surefire.argLine.additional>
     </properties>
@@ -192,9 +193,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.url>jdbc:postgresql://localhost:5431/hibernate_orm_test</postgres.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml
@@ -18,7 +18,7 @@
     </description>
 
     <properties>
-        <mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
+        <mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
     </properties>
 
     <dependencies>
@@ -195,9 +195,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml b/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml
@@ -16,7 +16,7 @@
     </description>
 
     <properties>
-        <mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
+        <mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
     </properties>
 
     <dependencies>
@@ -193,9 +193,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-orm-tenancy/datasource/pom.xml b/integration-tests/hibernate-orm-tenancy/datasource/pom.xml
@@ -15,7 +15,7 @@
     <description>Tests for Hibernate ORM Multitenancy using one datasource per tenant, running with the MariaDB database</description>
 
     <properties>
-        <mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
+        <mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
     </properties>
 
     <dependencies>
@@ -208,9 +208,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-reactive-db2/pom.xml b/integration-tests/hibernate-reactive-db2/pom.xml
@@ -14,8 +14,9 @@
     <description>Hibernate Reactive related tests running with the DB2 database</description>
 
     <properties>
-        <reactive-db2.url>vertx-reactive:db2://localhost:50000/hreact</reactive-db2.url>
+        <reactive-db2.url>vertx-reactive:db2://localhost:50005/hreact</reactive-db2.url>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -157,9 +158,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-db2.url>vertx-reactive:db2://localhost:50005/hreact</reactive-db2.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-reactive-mariadb/pom.xml b/integration-tests/hibernate-reactive-mariadb/pom.xml
@@ -14,7 +14,7 @@
     <description>Hibernate Reactive related tests running with the MariaDB database</description>
 
     <properties>
-        <reactive-mariadb.url>vertx-reactive:mysql://localhost:3306/hibernate_orm_test</reactive-mariadb.url>
+        <reactive-mariadb.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test</reactive-mariadb.url>
     </properties>
 
     <dependencies>
@@ -158,9 +158,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-mariadb.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test</reactive-mariadb.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml b/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml
@@ -14,8 +14,8 @@
     <description>Hibernate Reactive related tests running with the MySQL database and also using Agroal and Flyway</description>
 
     <properties>
-        <reactive-mysql.url>vertx-reactive:mysql://localhost:3306/hibernate_orm_test</reactive-mysql.url>
-        <mysql.jdbc.url>jdbc:mysql://localhost:3306/hibernate_orm_test</mysql.jdbc.url>
+        <reactive-mysql.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test?allowPublicKeyRetrieval=true</reactive-mysql.url>
+        <mysql.jdbc.url>jdbc:mysql://localhost:3308/hibernate_orm_test</mysql.jdbc.url>
     </properties>
 
     <dependencies>
@@ -214,10 +214,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-mysql.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test?allowPublicKeyRetrieval=true</reactive-mysql.url>
-                <mysql.jdbc.url>jdbc:mysql://localhost:3308/hibernate_orm_test</mysql.jdbc.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-reactive-mysql/pom.xml b/integration-tests/hibernate-reactive-mysql/pom.xml
@@ -14,7 +14,7 @@
     <description>Hibernate Reactive related tests running with the MySQL database</description>
 
     <properties>
-        <reactive-mysql.url>vertx-reactive:mysql://localhost:3306/hibernate_orm_test</reactive-mysql.url>
+        <reactive-mysql.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test?allowPublicKeyRetrieval=true</reactive-mysql.url>
     </properties>
 
     <dependencies>
@@ -160,9 +160,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <reactive-mysql.url>vertx-reactive:mysql://localhost:3308/hibernate_orm_test?allowPublicKeyRetrieval=true</reactive-mysql.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-reactive-panache-kotlin/pom.xml b/integration-tests/hibernate-reactive-panache-kotlin/pom.xml
@@ -13,7 +13,7 @@
     <name>Quarkus - Integration Tests - Hibernate Reactive with Panache and Kotlin</name>
 
     <properties>
-        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
     <dependencies>
@@ -281,9 +281,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-reactive-panache/pom.xml b/integration-tests/hibernate-reactive-panache/pom.xml
@@ -17,7 +17,7 @@
         PanacheQuery.project(Class) needs it.
     -->
     <properties>
-        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
     <dependencies>
@@ -268,9 +268,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/integration-tests/hibernate-reactive-postgresql/pom.xml b/integration-tests/hibernate-reactive-postgresql/pom.xml
@@ -14,7 +14,7 @@
     <description>Hibernate Reactive related tests running with the PostgreSQL database</description>
 
     <properties>
-        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
     <dependencies>
@@ -175,9 +175,6 @@
                     <name>start-containers</name>
                 </property>
             </activation>
-            <properties>
-                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
-            </properties>
             <build>
                 <plugins>
                     <plugin>