diff --git a/doc/oracle/README.md b/doc/oracle/README.md index 7e35bb0..61470e2 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: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/pom.xml b/galleon-feature-pack/pom.xml index cedef62..05b3b71 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.1.Final-redhat-SNAPSHOT + 8.1.0.Final-redhat-SNAPSHOT eap-datasources-galleon-pack pom 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 eab105c..d56fa3b 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: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/pom.xml b/pom.xml index 30ffced..ee3f381 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.jboss.eap eap-datasources-galleon-pack-parent - 8.0.1.Final-redhat-SNAPSHOT + 8.1.0.Final-redhat-SNAPSHOT pom Drivers and datasources for JBoss Entreprise Application Platform parent Drivers and datasources for JBoss Entreprise Application Platform parent @@ -45,11 +45,11 @@ 4.13.2 1 1.0.0 - 8.0.7.GA-redhat-SNAPSHOT - 1.0.1.Final-redhat-00011 + 8.0.0.GA-redhat-00011 + 2.0.0.Final-SNAPSHOT 1.5.1.Final-redhat-00001 21.0.9.Final-redhat-00001 - 6.4.8.Final-redhat-00001 + 7.3.0.Final 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 36df817..7748ecd 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.1.Final-redhat-SNAPSHOT + 8.1.0.Final-redhat-SNAPSHOT eap-datasources-galleon-pack-testsuite Drivers and datasources for JBoss Entreprise Application Platform galleon testsuite @@ -64,7 +64,7 @@ com.oracle.database.jdbc - ojdbc10 + ojdbc11 test @@ -112,6 +112,7 @@ org.jboss.eap.plugins eap-maven-plugin + true org.jboss.eap diff --git a/testsuite/pom.xml b/testsuite/pom.xml index b3c031b..5db66d1 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -22,7 +22,7 @@ org.jboss.eap eap-datasources-galleon-pack-parent - 8.0.1.Final-redhat-SNAPSHOT + 8.1.0.Final-redhat-SNAPSHOT eap-datasources-galleon-pack-testsuite-parent pom @@ -34,7 +34,7 @@ ${node0} 127.0.0.1 9.2.1.jre8 - 19.19.0.0 + 23.2.0.0 42.2.20 true @@ -43,7 +43,7 @@ com.oracle.database.jdbc - ojdbc10 + ojdbc11 ${org.jboss.eap.datasources.oracle.driver.version}