Fix for JBEAP-28158, [eap-datasources-galleon-pack] For 8.1, uses ojd…

…bc11 artifactId as default
jbossas · Nov 19, 2024 · 32005b6 · 32005b6
1 parent b5a0879
commit 32005b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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:ojdbc10` Maven artifact.
+  * Description: The version of the `com.oracle.database.jdbc:ojdbc11` 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: `ojdbc10`
+  * Default value: `ojdbc11`
   * 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
@@ -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:ojdbc10}:${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:ojdbc11}:${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
@@ -64,7 +64,7 @@
         <!-- For dependabot -->
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc10</artifactId>
+            <artifactId>ojdbc11</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -34,7 +34,7 @@
         <management.address>${node0}</management.address>
         <node0>127.0.0.1</node0>
         <org.jboss.eap.datasources.mssqlserver.driver.version>9.2.1.jre8</org.jboss.eap.datasources.mssqlserver.driver.version>
-        <org.jboss.eap.datasources.oracle.driver.version>19.19.0.0</org.jboss.eap.datasources.oracle.driver.version>
+        <org.jboss.eap.datasources.oracle.driver.version>23.2.0.0</org.jboss.eap.datasources.oracle.driver.version>
         <org.jboss.eap.datasources.postgresql.driver.version>42.2.20</org.jboss.eap.datasources.postgresql.driver.version>
         <testLogToFile>true</testLogToFile>
     </properties>
@@ -43,7 +43,7 @@
         <dependencies>
             <dependency>
                 <groupId>com.oracle.database.jdbc</groupId>
-                <artifactId>ojdbc10</artifactId>
+                <artifactId>ojdbc11</artifactId>
                 <version>${org.jboss.eap.datasources.oracle.driver.version}</version>
             </dependency>
             <dependency>