From 604d84ec9a27470265e9285deadaff403290ec0c Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Mon, 7 Oct 2024 11:57:22 +0200 Subject: [PATCH 1/2] Next release is 8.0.1.Final-redhat-xxxxx --- galleon-feature-pack/pom.xml | 2 +- pom.xml | 8 ++++---- testsuite/galleon/pom.xml | 2 +- testsuite/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/galleon-feature-pack/pom.xml b/galleon-feature-pack/pom.xml index 3d10688..cedef62 100644 --- a/galleon-feature-pack/pom.xml +++ b/galleon-feature-pack/pom.xml @@ -22,7 +22,7 @@ org.jboss.eap eap-datasources-galleon-pack-parent - 8.0.0.Final-redhat-SNAPSHOT + 8.0.1.Final-redhat-SNAPSHOT eap-datasources-galleon-pack pom diff --git a/pom.xml b/pom.xml index b1e2e3f..30ffced 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.jboss.eap eap-datasources-galleon-pack-parent - 8.0.0.Final-redhat-SNAPSHOT + 8.0.1.Final-redhat-SNAPSHOT pom Drivers and datasources for JBoss Entreprise Application Platform parent Drivers and datasources for JBoss Entreprise Application Platform parent @@ -45,10 +45,10 @@ 4.13.2 1 1.0.0 - 8.0.0.GA-redhat-SNAPSHOT - 1.0.0.Final-redhat-00001 + 8.0.7.GA-redhat-SNAPSHOT + 1.0.1.Final-redhat-00011 1.5.1.Final-redhat-00001 - 21.0.3.Final-redhat-00001 + 21.0.9.Final-redhat-00001 6.4.8.Final-redhat-00001 git@github.com:jbossas/eap-datasources-galleon-pack.git https://github.com/jbossas/eap-datasources-galleon-pack diff --git a/testsuite/galleon/pom.xml b/testsuite/galleon/pom.xml index 5eb2393..e256353 100644 --- a/testsuite/galleon/pom.xml +++ b/testsuite/galleon/pom.xml @@ -22,7 +22,7 @@ org.jboss.eap eap-datasources-galleon-pack-testsuite-parent - 8.0.0.Final-redhat-SNAPSHOT + 8.0.1.Final-redhat-SNAPSHOT eap-datasources-galleon-pack-testsuite Drivers and datasources for JBoss Entreprise Application Platform galleon testsuite diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 2a5ae9a..d67092e 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -22,7 +22,7 @@ org.jboss.eap eap-datasources-galleon-pack-parent - 8.0.0.Final-redhat-SNAPSHOT + 8.0.1.Final-redhat-SNAPSHOT eap-datasources-galleon-pack-testsuite-parent pom From 6d91dde645a09e51d0aaf4c6b8bfa0531be463f7 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Mon, 7 Oct 2024 11:52:57 +0200 Subject: [PATCH 2/2] Fix for JBEAP-28156, Wrong default value for oracle driver artifactId --- doc/oracle/README.md | 4 ++-- .../resources/resources/wildfly/artifact-versions.properties | 2 +- testsuite/galleon/pom.xml | 2 +- testsuite/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/oracle/README.md b/doc/oracle/README.md index 5f7c1b9..7e35bb0 100644 --- a/doc/oracle/README.md +++ b/doc/oracle/README.md @@ -14,7 +14,7 @@ Required configuration * `ORACLE_DRIVER_VERSION` - * Description: The version of the `com.oracle.database.jdbc:ojdbc8` Maven artifact. + * Description: The version of the `com.oracle.database.jdbc:ojdbc10` Maven artifact. * No default value. * Required: True * System Property: `org.jboss.eap.datasources.oracle.driver.version` @@ -27,7 +27,7 @@ Configuration that can be provided when provisioning the Galleon feature-pack. * `ORACLE_DRIVER_ARTIFACT_ID` * Description: The artifactId of the driver Maven artifact. - * Default value: `ojdbc8` + * Default value: `ojdbc10` * Required: False * System Property: `org.jboss.eap.datasources.oracle.driver.artifactId` diff --git a/galleon-feature-pack/src/main/resources/resources/wildfly/artifact-versions.properties b/galleon-feature-pack/src/main/resources/resources/wildfly/artifact-versions.properties index 7a600f1..eab105c 100644 --- a/galleon-feature-pack/src/main/resources/resources/wildfly/artifact-versions.properties +++ b/galleon-feature-pack/src/main/resources/resources/wildfly/artifact-versions.properties @@ -1,3 +1,3 @@ com.microsoft.sqlserver:mssql-jdbc=com.microsoft.sqlserver:mssql-jdbc:${org.jboss.eap.datasources.mssqlserver.driver.version,env.MSSQLSERVER_DRIVER_VERSION}::jar -com.oracle.database.jdbc:ojdbc=${org.jboss.eap.datasources.oracle.driver.groupId,env.ORACLE_DRIVER_GROUP_ID:com.oracle.database.jdbc}:${org.jboss.eap.datasources.oracle.driver.artifactId,env.ORACLE_DRIVER_ARTIFACT_ID:ojdbc8}:${org.jboss.eap.datasources.oracle.driver.version,env.ORACLE_DRIVER_VERSION}::jar +com.oracle.database.jdbc:ojdbc=${org.jboss.eap.datasources.oracle.driver.groupId,env.ORACLE_DRIVER_GROUP_ID:com.oracle.database.jdbc}:${org.jboss.eap.datasources.oracle.driver.artifactId,env.ORACLE_DRIVER_ARTIFACT_ID:ojdbc10}:${org.jboss.eap.datasources.oracle.driver.version,env.ORACLE_DRIVER_VERSION}::jar org.postgresql:postgresql=org.postgresql:postgresql:${org.jboss.eap.datasources.postgresql.driver.version,env.POSTGRESQL_DRIVER_VERSION}::jar diff --git a/testsuite/galleon/pom.xml b/testsuite/galleon/pom.xml index e256353..36df817 100644 --- a/testsuite/galleon/pom.xml +++ b/testsuite/galleon/pom.xml @@ -64,7 +64,7 @@ com.oracle.database.jdbc - ojdbc8 + ojdbc10 test diff --git a/testsuite/pom.xml b/testsuite/pom.xml index d67092e..b3c031b 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -34,7 +34,7 @@ ${node0} 127.0.0.1 9.2.1.jre8 - 19.3.0.0 + 19.19.0.0 42.2.20 true @@ -43,7 +43,7 @@ com.oracle.database.jdbc - ojdbc8 + ojdbc10 ${org.jboss.eap.datasources.oracle.driver.version}