diff --git a/databases/oracle/matrix.gradle b/databases/oracle/matrix.gradle
index 2355701ef4..1805b136d7 100644
--- a/databases/oracle/matrix.gradle
+++ b/databases/oracle/matrix.gradle
@@ -4,6 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-// Expected to match the jar name: drop a copy of ojdbc8.jar in a local directory,
-// then point the environment variable ADDITIONAL_REPO to that directory.
-jdbcDependency name : 'ojdbc8'
+jdbcDependency 'com.oracle.database.jdbc:ojdbc8:19.8.0.0'
\ No newline at end of file
diff --git a/databases/oracle/resources/hibernate.properties b/databases/oracle/resources/hibernate.properties
index 05f554eec3..d0a07e0b6c 100644
--- a/databases/oracle/resources/hibernate.properties
+++ b/databases/oracle/resources/hibernate.properties
@@ -6,7 +6,7 @@
 #
 
 hibernate.dialect org.hibernate.dialect.Oracle12cDialect
-hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+hibernate.connection.driver_class oracle.jdbc.OracleDriver
 hibernate.connection.url jdbc:oracle:thin:@hibernate-testing-oracle-se.ccuzkqo3zqzq.us-east-1.rds.amazonaws.com:1521:ORCL
 hibernate.connection.username hibernate_orm_test
 hibernate.connection.password hibernate_orm_test
diff --git a/etc/hibernate.properties b/etc/hibernate.properties
index 42145e5dc4..cb78aabf2c 100644
--- a/etc/hibernate.properties
+++ b/etc/hibernate.properties
@@ -69,7 +69,7 @@ hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate
 #hibernate.dialect org.hibernate.dialect.Oracle8iDialect
 #hibernate.dialect org.hibernate.dialect.Oracle9iDialect
 #hibernate.dialect org.hibernate.dialect.Oracle10gDialect
-#hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+#hibernate.connection.driver_class oracle.jdbc.OracleDriver
 #hibernate.connection.username ora
 #hibernate.connection.password ora
 #hibernate.connection.url jdbc:oracle:thin:@localhost:1521:orcl
diff --git a/etc/hibernate.properties.template b/etc/hibernate.properties.template
index e147bc9986..3b9c7681d9 100644
--- a/etc/hibernate.properties.template
+++ b/etc/hibernate.properties.template
@@ -54,7 +54,7 @@ hibernate.connection.url @DB_URL@
 
 #hibernate.dialect org.hibernate.dialect.OracleDialect
 #hibernate.dialect org.hibernate.dialect.Oracle9Dialect
-#hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+#hibernate.connection.driver_class oracle.jdbc.OracleDriver
 #hibernate.connection.username ora
 #hibernate.connection.password ora
 #hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test
diff --git a/gradle/databases.gradle b/gradle/databases.gradle
index 701347d6b5..f5a508dee7 100644
--- a/gradle/databases.gradle
+++ b/gradle/databases.gradle
@@ -74,7 +74,7 @@ ext {
                 ],
                 oracle : [
                         'db.dialect' : 'org.hibernate.dialect.Oracle10gDialect',
-                        'jdbc.driver': 'oracle.jdbc.driver.OracleDriver',
+                        'jdbc.driver': 'oracle.jdbc.OracleDriver',
                         'jdbc.user'  : 'hibernate_orm_test',
                         'jdbc.pass'  : 'hibernate_orm_test',
                         'jdbc.url'   : 'jdbc:oracle:thin:@localhost:1521/xe'
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index 0e0531217d..78a52836c9 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -90,9 +90,7 @@ dependencies {
 	asciidoclet 'org.asciidoctor:asciidoclet:1.+'
 
 	if ( db.equalsIgnoreCase( 'oracle' ) ) {
-		testRuntime( libraries.oracle ) {
-			exclude group: 'com.oracle.jdbc', module: 'xmlparserv2'
-		}
+		testRuntime( libraries.oracle )
 	}
 	else if ( db.equalsIgnoreCase( 'db2' ) ) {
 		testRuntime( libraries.db2 )
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index 161dd33ba0..8be06f4613 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -116,7 +116,7 @@ ext {
             mariadb:         'org.mariadb.jdbc:mariadb-java-client:2.2.3',
             cockroachdb:     'org.postgresql:postgresql:42.2.8',
 
-            oracle:          'com.oracle.jdbc:ojdbc8:12.2.0.1',
+            oracle:          'com.oracle.database.jdbc:ojdbc8:19.8.0.0',
             mssql:           'com.microsoft.sqlserver:mssql-jdbc:7.2.1.jre8',
             db2:             'com.ibm.db2:db2jcc:10.5',
             hana:            'com.sap.cloud.db.jdbc:ngdbc:2.4.59',
diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle
index a5ff50748e..6c9bf7444f 100644
--- a/hibernate-c3p0/hibernate-c3p0.gradle
+++ b/hibernate-c3p0/hibernate-c3p0.gradle
@@ -25,9 +25,7 @@ dependencies {
     testRuntime( libraries.expression_language )
 
     if ( db.equalsIgnoreCase( 'oracle' ) ) {
-        testRuntime( libraries.oracle ) {
-            exclude group: 'com.oracle.jdbc', module: 'xmlparserv2'
-        }
+        testRuntime( libraries.oracle )
     }
 }
 
diff --git a/hibernate-spatial/databases/oracle12c_connection_finder/resources/hibernate.properties b/hibernate-spatial/databases/oracle12c_connection_finder/resources/hibernate.properties
index cd5168ec01..d71e6c8d3f 100644
--- a/hibernate-spatial/databases/oracle12c_connection_finder/resources/hibernate.properties
+++ b/hibernate-spatial/databases/oracle12c_connection_finder/resources/hibernate.properties
@@ -6,7 +6,7 @@
 #
 
 hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect
-hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+hibernate.connection.driver_class oracle.jdbc.OracleDriver
 hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCLCDB
 hibernate.connection.username C##hibernate
 hibernate.connection.password hibernate
diff --git a/hibernate-spatial/databases/oracle12c_spatial/resources/hibernate.properties b/hibernate-spatial/databases/oracle12c_spatial/resources/hibernate.properties
index 4a9b1af111..ddb680a8e8 100644
--- a/hibernate-spatial/databases/oracle12c_spatial/resources/hibernate.properties
+++ b/hibernate-spatial/databases/oracle12c_spatial/resources/hibernate.properties
@@ -6,7 +6,7 @@
 #
 
 hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect
-hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+hibernate.connection.driver_class oracle.jdbc.OracleDriver
 hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCLCDB
 hibernate.connection.username C##hibernate
 hibernate.connection.password hibernate
diff --git a/hibernate-spatial/databases/oracle12c_spatial_native/resources/hibernate.properties b/hibernate-spatial/databases/oracle12c_spatial_native/resources/hibernate.properties
index 15cfa9e970..6c7104093f 100644
--- a/hibernate-spatial/databases/oracle12c_spatial_native/resources/hibernate.properties
+++ b/hibernate-spatial/databases/oracle12c_spatial_native/resources/hibernate.properties
@@ -6,7 +6,7 @@
 #
 
 hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatialSDO10gDialect
-hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+hibernate.connection.driver_class oracle.jdbc.OracleDriver
 hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCLCDB
 hibernate.connection.username C##hibernate
 hibernate.connection.password hibernate
diff --git a/hibernate-spatial/src/test/resources/hibernate.properties b/hibernate-spatial/src/test/resources/hibernate.properties
index d1d27f0a6b..abef2d2a22 100644
--- a/hibernate-spatial/src/test/resources/hibernate.properties
+++ b/hibernate-spatial/src/test/resources/hibernate.properties
@@ -49,13 +49,13 @@ hibernate.connection.password @jdbc.pass@
 ##
 #hibernate.spatial.connection_finder org.hibernate.spatial.dialect.oracle.TestConnectionFinder
 #hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect
-#hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+#hibernate.connection.driver_class oracle.jdbc.OracleDriver
 #hibernate.connection.url jdbc:oracle:thin:@localhost:1521/orcl12c
 #hibernate.connection.username C##hibernate
 #hibernate.connection.password hibernate
 
 #hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatialSDO10gDialect
-#hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+#hibernate.connection.driver_class oracle.jdbc.OracleDriver
 #hibernate.connection.url jdbc:oracle:thin:@localhost:1521/orcl12c
 #hibernate.connection.username C##hibernate
 #hibernate.connection.password hibernate