Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for JBEAP-28156, Wrong default value for oracle driver artifactId #119

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Fix for JBEAP-28156, Wrong default value for oracle driver artifactId #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
604d84e
Next release is 8.0.1.Final-redhat-xxxxx
jfdenise Oct 7, 2024
6d91dde
Fix for JBEAP-28156, Wrong default value for oracle driver artifactId
jfdenise Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/oracle/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion galleon-feature-pack/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss.eap</groupId>
<artifactId>eap-datasources-galleon-pack-parent</artifactId>
<version>8.0.0.Final-redhat-SNAPSHOT</version>
<version>8.0.1.Final-redhat-SNAPSHOT</version>
</parent>
<artifactId>eap-datasources-galleon-pack</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion galleon-feature-pack/src/main/resources/resources/wildfly/artifact-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>
<groupId>org.jboss.eap</groupId>
<artifactId>eap-datasources-galleon-pack-parent</artifactId>
<version>8.0.0.Final-redhat-SNAPSHOT</version>
<version>8.0.1.Final-redhat-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Drivers and datasources for JBoss Entreprise Application Platform parent</name>
<description>Drivers and datasources for JBoss Entreprise Application Platform parent</description>
Expand All @@ -45,10 +45,10 @@
<version.junit>4.13.2</version.junit>
<version.inject>1</version.inject>
<version.org.codehaus.mojo.properties-maven-plugin>1.0.0</version.org.codehaus.mojo.properties-maven-plugin>
<version.org.jboss.eap>8.0.0.GA-redhat-SNAPSHOT</version.org.jboss.eap>
<version.org.jboss.eap.maven.plugin>1.0.0.Final-redhat-00001</version.org.jboss.eap.maven.plugin>
<version.org.jboss.eap>8.0.7.GA-redhat-SNAPSHOT</version.org.jboss.eap>
<version.org.jboss.eap.maven.plugin>1.0.1.Final-redhat-00011</version.org.jboss.eap.maven.plugin>
<version.org.jboss.jboss-dmr>1.5.1.Final-redhat-00001</version.org.jboss.jboss-dmr>
<version.org.wildfly.core>21.0.3.Final-redhat-00001</version.org.wildfly.core>
<version.org.wildfly.core>21.0.9.Final-redhat-00001</version.org.wildfly.core>
<version.org.wildfly.galleon-plugins>6.4.8.Final-redhat-00001</version.org.wildfly.galleon-plugins>
<jbossas.repo.scm.connection>[email protected]:jbossas/eap-datasources-galleon-pack.git</jbossas.repo.scm.connection>
<jbossas.repo.scm.url>https://github.com/jbossas/eap-datasources-galleon-pack</jbossas.repo.scm.url>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/galleon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss.eap</groupId>
<artifactId>eap-datasources-galleon-pack-testsuite-parent</artifactId>
<version>8.0.0.Final-redhat-SNAPSHOT</version>
<version>8.0.1.Final-redhat-SNAPSHOT</version>
</parent>
<artifactId>eap-datasources-galleon-pack-testsuite</artifactId>
<name>Drivers and datasources for JBoss Entreprise Application Platform galleon testsuite</name>
Expand Down Expand Up @@ -64,7 +64,7 @@
<!-- For dependabot -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<artifactId>ojdbc10</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions testsuite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss.eap</groupId>
<artifactId>eap-datasources-galleon-pack-parent</artifactId>
<version>8.0.0.Final-redhat-SNAPSHOT</version>
<version>8.0.1.Final-redhat-SNAPSHOT</version>
</parent>
<artifactId>eap-datasources-galleon-pack-testsuite-parent</artifactId>
<packaging>pom</packaging>
Expand All @@ -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.3.0.0</org.jboss.eap.datasources.oracle.driver.version>
<org.jboss.eap.datasources.oracle.driver.version>19.19.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>
Expand All @@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<artifactId>ojdbc10</artifactId>
<version>${org.jboss.eap.datasources.oracle.driver.version}</version>
</dependency>
<dependency>
Expand Down
Loading