From 546922cf13b4de2d84966550577c0f22ef27000c Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Wed, 5 Apr 2023 11:28:44 +0100 Subject: [PATCH] Upgrade the reference oracle database container used across integration tests --- build-parent/pom.xml | 2 +- .../oracle/deployment/OracleDevServicesProcessor.java | 8 ++++++-- extensions/reactive-oracle-client/deployment/pom.xml | 4 ++-- .../reactive/oracle/client/ReactiveOracleReloadTest.java | 2 +- .../application-credentials-with-erroneous-url.properties | 2 +- ...ion-multiple-datasources-with-erroneous-url.properties | 4 ++-- integration-tests/jpa-oracle/README.md | 2 +- integration-tests/jpa-oracle/pom.xml | 4 ++-- .../quarkus/it/opentelemetry/OracleLifecycleManager.java | 2 +- integration-tests/reactive-oracle-client/README.md | 2 +- integration-tests/reactive-oracle-client/pom.xml | 4 ++-- 11 files changed, 20 insertions(+), 16 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 4334280feac4d..fabe62be00cf1 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -94,7 +94,7 @@ docker.io/ibmcom/db2:11.5.7.0a mcr.microsoft.com/mssql/server:2019-latest docker.io/mysql:8.0 - docker.io/gvenzl/oracle-xe:21-slim-faststart + docker.io/gvenzl/oracle-free:23.2.0-faststart docker.io/mongo:4.4 diff --git a/extensions/devservices/oracle/src/main/java/io/quarkus/devservices/oracle/deployment/OracleDevServicesProcessor.java b/extensions/devservices/oracle/src/main/java/io/quarkus/devservices/oracle/deployment/OracleDevServicesProcessor.java index 8e88e884170a5..509f4dcd2b594 100644 --- a/extensions/devservices/oracle/src/main/java/io/quarkus/devservices/oracle/deployment/OracleDevServicesProcessor.java +++ b/extensions/devservices/oracle/src/main/java/io/quarkus/devservices/oracle/deployment/OracleDevServicesProcessor.java @@ -29,7 +29,11 @@ public class OracleDevServicesProcessor { private static final Logger LOG = Logger.getLogger(OracleDevServicesProcessor.class); - public static final String IMAGE = "gvenzl/oracle-xe"; + /** + * This is the container name as defined by the Testcontainer's OracleContainer: + * does not necessarily match the container name that Quarkus will default to use. + */ + public static final String ORIGINAL_IMAGE_NAME = "gvenzl/oracle-xe"; public static final int PORT = 1521; @BuildStep @@ -91,7 +95,7 @@ public QuarkusOracleServerContainer(Optional imageName, OptionalInt fixe boolean useSharedNetwork) { super(DockerImageName .parse(imageName.orElseGet(() -> ConfigureUtil.getDefaultImageNameFor("oracle"))) - .asCompatibleSubstituteFor(OracleDevServicesProcessor.IMAGE)); + .asCompatibleSubstituteFor(OracleDevServicesProcessor.ORIGINAL_IMAGE_NAME)); this.fixedExposedPort = fixedExposedPort; this.useSharedNetwork = useSharedNetwork; } diff --git a/extensions/reactive-oracle-client/deployment/pom.xml b/extensions/reactive-oracle-client/deployment/pom.xml index 9efdecc7d6367..48e7440082102 100644 --- a/extensions/reactive-oracle-client/deployment/pom.xml +++ b/extensions/reactive-oracle-client/deployment/pom.xml @@ -15,7 +15,7 @@ Quarkus - Reactive Oracle Client - Deployment - vertx-reactive:oracle:thin:@localhost:1521:XE + vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1 @@ -131,7 +131,7 @@ - vertx-reactive:oracle:thin:@localhost:1521:XE + vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1 diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/ReactiveOracleReloadTest.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/ReactiveOracleReloadTest.java index 4c39bb3eb079f..b84018f654060 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/ReactiveOracleReloadTest.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/ReactiveOracleReloadTest.java @@ -16,7 +16,7 @@ public class ReactiveOracleReloadTest { .add(new StringAsset("quarkus.datasource.db-kind=oracle\n" + "quarkus.datasource.username=SYSTEM\n" + "quarkus.datasource.password=hibernate_orm_test\n" + - "quarkus.datasource.reactive.url=vertx-reactive:oracle:thin:@localhost:2115:XE"), + "quarkus.datasource.reactive.url=vertx-reactive:oracle:thin:@localhost:2115/FREEPDB1"), "application.properties")); @Test diff --git a/extensions/reactive-oracle-client/deployment/src/test/resources/application-credentials-with-erroneous-url.properties b/extensions/reactive-oracle-client/deployment/src/test/resources/application-credentials-with-erroneous-url.properties index df109c4000943..a9a701f892f9b 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/resources/application-credentials-with-erroneous-url.properties +++ b/extensions/reactive-oracle-client/deployment/src/test/resources/application-credentials-with-erroneous-url.properties @@ -1,3 +1,3 @@ quarkus.datasource.db-kind=oracle quarkus.datasource.credentials-provider=custom -quarkus.datasource.reactive.url=vertx-reactive:oracle:thin:@test:12345:XE +quarkus.datasource.reactive.url=vertx-reactive:oracle:thin:@test:12345/FREEPDB1 diff --git a/extensions/reactive-oracle-client/deployment/src/test/resources/application-multiple-datasources-with-erroneous-url.properties b/extensions/reactive-oracle-client/deployment/src/test/resources/application-multiple-datasources-with-erroneous-url.properties index b1461c2cd52e3..ae77eabd7624b 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/resources/application-multiple-datasources-with-erroneous-url.properties +++ b/extensions/reactive-oracle-client/deployment/src/test/resources/application-multiple-datasources-with-erroneous-url.properties @@ -1,9 +1,9 @@ quarkus.datasource.db-kind=oracle quarkus.datasource.username=SYSTEM quarkus.datasource.password=hibernate_orm_test -quarkus.datasource.reactive.url=vertx-reactive:oracle:thin:@test:12345:XE +quarkus.datasource.reactive.url=vertx-reactive:oracle:thin:@test:12345/FREEPDB1 quarkus.datasource."hibernate".db-kind=oracle quarkus.datasource."hibernate".username=SYSTEM quarkus.datasource."hibernate".password=hibernate_orm_test -quarkus.datasource."hibernate".reactive.url=vertx-reactive:oracle:thin:@test:55555:XE +quarkus.datasource."hibernate".reactive.url=vertx-reactive:oracle:thin:@test:55555/FREEPDB1 diff --git a/integration-tests/jpa-oracle/README.md b/integration-tests/jpa-oracle/README.md index d13ac7f80b339..bdcabaf91e46b 100644 --- a/integration-tests/jpa-oracle/README.md +++ b/integration-tests/jpa-oracle/README.md @@ -22,7 +22,7 @@ Authentication parameters might need to be changed in the Quarkus configuration ### Starting Oracle via docker ``` -docker run --memory-swappiness=0 --rm=true --name=HibernateTestingOracle -p 1521:1521 -e ORACLE_PASSWORD=hibernate_orm_test docker.io/gvenzl/oracle-xe:21-slim-faststart +docker run --rm=true --name=HibernateTestingOracle -p 1521:1521 -e ORACLE_PASSWORD=hibernate_orm_test docker.io/gvenzl/oracle-free:23.2.0-faststart ``` This will start a local instance with the configuration matching the parameters used by the integration tests of this module. diff --git a/integration-tests/jpa-oracle/pom.xml b/integration-tests/jpa-oracle/pom.xml index 1cb16237ce7e1..aa54643224244 100644 --- a/integration-tests/jpa-oracle/pom.xml +++ b/integration-tests/jpa-oracle/pom.xml @@ -14,7 +14,7 @@ Module that contains JPA related tests running with the Oracle database - jdbc:oracle:thin:@localhost:1521/XE + jdbc:oracle:thin:@localhost:1521/FREEPDB1 @@ -187,7 +187,7 @@ - jdbc:oracle:thin:@localhost:1521/XE + jdbc:oracle:thin:@localhost:1521/FREEPDB1 diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java index aab9c7dbd5f21..0bd02392b3c3f 100644 --- a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java +++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java @@ -10,7 +10,7 @@ public class OracleLifecycleManager implements QuarkusTestResourceLifecycleManag @Override public Map start() { Map properties = new HashMap<>(); - properties.put("quarkus.datasource.oracle.jdbc.url", "jdbc:oracle:thin:@localhost:1521/XE"); + properties.put("quarkus.datasource.oracle.jdbc.url", "jdbc:oracle:thin:@localhost:1521/FREEPDB1"); properties.put("quarkus.datasource.oracle.password", "quarkus"); properties.put("quarkus.datasource.oracle.username", "SYSTEM"); properties.put("quarkus.hibernate-orm.oracle.database.generation", "drop-and-create"); diff --git a/integration-tests/reactive-oracle-client/README.md b/integration-tests/reactive-oracle-client/README.md index 225900fe1ce09..d6d23d284aa1d 100644 --- a/integration-tests/reactive-oracle-client/README.md +++ b/integration-tests/reactive-oracle-client/README.md @@ -23,7 +23,7 @@ Authentication parameters might need to be changed in the Quarkus configuration ### Starting Oracle via docker ``` -docker run --memory-swappiness=0 --rm=true --name=HibernateTestingOracle -p 1521:1521 -e ORACLE_PASSWORD=hibernate_orm_test docker.io/gvenzl/oracle-xe:21-slim-faststart +docker run --rm=true --name=HibernateTestingOracle -p 1521:1521 -e ORACLE_PASSWORD=hibernate_orm_test docker.io/gvenzl/oracle-free:23.2.0-faststart ``` This will start a local instance with the configuration matching the parameters used by the integration tests of this module. diff --git a/integration-tests/reactive-oracle-client/pom.xml b/integration-tests/reactive-oracle-client/pom.xml index d9a1b56afc598..849ebf488439c 100644 --- a/integration-tests/reactive-oracle-client/pom.xml +++ b/integration-tests/reactive-oracle-client/pom.xml @@ -15,7 +15,7 @@ Quarkus - Integration Tests - Reactive Oracle Client - vertx-reactive:oracle:thin:@localhost:1521:XE + vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1 @@ -152,7 +152,7 @@ - vertx-reactive:oracle:thin:@localhost:1521:XE + vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1