Skip to content

Commit 16b8641

Browse files
authored
Merge pull request #122 from jfdenise/main
Fix for JBEAP-29193, For 8.1, uses ojdbc17 artifactId as default @jfdenise
2 parents 27eb9b3 + 017f913 commit 16b8641

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

doc/oracle/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Required configuration
1414

1515
* `ORACLE_DRIVER_VERSION`
1616

17-
* Description: The version of the `com.oracle.database.jdbc:ojdbc11` Maven artifact.
17+
* Description: The version of the `com.oracle.database.jdbc:ojdbc17` Maven artifact.
1818
* No default value.
1919
* Required: True
2020
* System Property: `org.jboss.eap.datasources.oracle.driver.version`
@@ -27,7 +27,7 @@ Configuration that can be provided when provisioning the Galleon feature-pack.
2727
* `ORACLE_DRIVER_ARTIFACT_ID`
2828

2929
* Description: The artifactId of the driver Maven artifact.
30-
* Default value: `ojdbc11`
30+
* Default value: `ojdbc17`
3131
* Required: False
3232
* System Property: `org.jboss.eap.datasources.oracle.driver.artifactId`
3333

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
com.microsoft.sqlserver:mssql-jdbc=com.microsoft.sqlserver:mssql-jdbc:${org.jboss.eap.datasources.mssqlserver.driver.version,env.MSSQLSERVER_DRIVER_VERSION}::jar
2-
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
2+
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:ojdbc17}:${org.jboss.eap.datasources.oracle.driver.version,env.ORACLE_DRIVER_VERSION}::jar
33
org.postgresql:postgresql=org.postgresql:postgresql:${org.jboss.eap.datasources.postgresql.driver.version,env.POSTGRESQL_DRIVER_VERSION}::jar

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
<version.junit>4.13.2</version.junit>
4646
<version.inject>1</version.inject>
4747
<version.org.codehaus.mojo.properties-maven-plugin>1.0.0</version.org.codehaus.mojo.properties-maven-plugin>
48-
<version.org.jboss.eap>8.0.0.GA-redhat-00011</version.org.jboss.eap>
49-
<version.org.jboss.eap.maven.plugin>2.0.0.Final-SNAPSHOT</version.org.jboss.eap.maven.plugin>
48+
<version.org.jboss.eap>8.1.0.Beta-redhat-00001</version.org.jboss.eap>
49+
<version.org.jboss.eap.maven.plugin>2.0.0.Beta1-redhat-00002</version.org.jboss.eap.maven.plugin>
5050
<version.org.jboss.jboss-dmr>1.5.1.Final-redhat-00001</version.org.jboss.jboss-dmr>
51-
<version.org.wildfly.core>21.0.9.Final-redhat-00001</version.org.wildfly.core>
52-
<version.org.wildfly.galleon-plugins>7.3.0.Final</version.org.wildfly.galleon-plugins>
51+
<version.org.wildfly.core>27.0.1.Final-redhat-00002</version.org.wildfly.core>
52+
<version.org.wildfly.galleon-plugins>7.3.1.Final</version.org.wildfly.galleon-plugins>
5353
<jbossas.repo.scm.connection>[email protected]:jbossas/eap-datasources-galleon-pack.git</jbossas.repo.scm.connection>
5454
<jbossas.repo.scm.url>https://github.com/jbossas/eap-datasources-galleon-pack</jbossas.repo.scm.url>
5555
</properties>

testsuite/galleon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<!-- For dependabot -->
6565
<dependency>
6666
<groupId>com.oracle.database.jdbc</groupId>
67-
<artifactId>ojdbc11</artifactId>
67+
<artifactId>ojdbc17</artifactId>
6868
<scope>test</scope>
6969
</dependency>
7070
<dependency>

testsuite/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<management.address>${node0}</management.address>
3535
<node0>127.0.0.1</node0>
3636
<org.jboss.eap.datasources.mssqlserver.driver.version>9.2.1.jre8</org.jboss.eap.datasources.mssqlserver.driver.version>
37-
<org.jboss.eap.datasources.oracle.driver.version>23.2.0.0</org.jboss.eap.datasources.oracle.driver.version>
37+
<org.jboss.eap.datasources.oracle.driver.version>23.6.0.24.10</org.jboss.eap.datasources.oracle.driver.version>
3838
<org.jboss.eap.datasources.postgresql.driver.version>42.2.20</org.jboss.eap.datasources.postgresql.driver.version>
3939
<testLogToFile>true</testLogToFile>
4040
</properties>
@@ -43,7 +43,7 @@
4343
<dependencies>
4444
<dependency>
4545
<groupId>com.oracle.database.jdbc</groupId>
46-
<artifactId>ojdbc11</artifactId>
46+
<artifactId>ojdbc17</artifactId>
4747
<version>${org.jboss.eap.datasources.oracle.driver.version}</version>
4848
</dependency>
4949
<dependency>

0 commit comments

Comments
 (0)