diff --git a/.gitignore b/.gitignore
index 38e2d26a02..0a94905782 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ dependency-reduced-pom.xml
 nb-configuration.xml
 nbactions*.xml
 .checkstyle
+.vscode
 
diff --git a/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml b/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml
index a56118075b..37ac38a89c 100644
--- a/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml
+++ b/openjpa-examples/jest/src/main/resources/META-INF/persistence.xml
@@ -27,7 +27,7 @@
         <class>demo.Actor</class>
 
         <properties>
-        <property name="javax.persistence.jdbc.driver"   value="com.mysql.jdbc.Driver"/>
+        <property name="javax.persistence.jdbc.driver"   value="com.mysql.cj.jdbc.Driver"/>
         <property name="javax.persistence.jdbc.url"      value="jdbc:mysql://localhost/jest"/>
         <property name="javax.persistence.jdbc.user"     value="root"/>
         <property name="javax.persistence.jdbc.password" value=""/>
diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml
index bbd1a501e1..c766c7ae5e 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -70,8 +70,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -241,4 +241,3 @@
 
     </profiles>
 </project>
-
diff --git a/openjpa-examples/openbooks/run.properties b/openjpa-examples/openbooks/run.properties
index 01fe35fc02..30e6d5bea4 100644
--- a/openjpa-examples/openbooks/run.properties
+++ b/openjpa-examples/openbooks/run.properties
@@ -25,6 +25,6 @@ openjpa.version=2.3.0-SNAPSHOT
 openjpa.lib=${maven.repos}/org/apache/openjpa/openjpa-all/${openjpa.version}
 # Other depends
 # MySQL
-#jdbc.driver=${maven.repos}/mysql/mysql-connector-java/5.1.12/mysql-connector-java-5.1.12.jar
+#jdbc.driver=${maven.repos}/com.mysql/mysql-connector-j/8.0.31/mysql-connector-j-8.0.31.jar
 # Derby
 jdbc.driver=${maven.repos}/org/apache/derby/derby/10.8.2.2/derby-10.8.2.2.jar
diff --git a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
index c7a6ddd3b0..b04c905225 100644
--- a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
+++ b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
@@ -36,7 +36,7 @@
 
         <properties>
         <!-- Use these for MySQL
-            <property name="javax.persistence.jdbc.driver"   value="com.mysql.jdbc.Driver"/>
+            <property name="javax.persistence.jdbc.driver"   value="com.mysql.cj.jdbc.Driver"/>
             <property name="javax.persistence.jdbc.url"      value="jdbc:mysql://localhost/OpenBooks"/>
             <property name="javax.persistence.jdbc.user"     value="user"/>
             <property name="javax.persistence.jdbc.password" value="password"/>
diff --git a/openjpa-examples/opentrader/src/main/resources/META-INF/persistence.xml b/openjpa-examples/opentrader/src/main/resources/META-INF/persistence.xml
index e73d636695..1546811d01 100644
--- a/openjpa-examples/opentrader/src/main/resources/META-INF/persistence.xml
+++ b/openjpa-examples/opentrader/src/main/resources/META-INF/persistence.xml
@@ -31,7 +31,7 @@
 
         <properties>
         <property name="openjpa.BrokerFactory"             value="slice"/>
-        <property name="openjpa.ConnectionDriverName"      value="com.mysql.jdbc.Driver"/>
+        <property name="openjpa.ConnectionDriverName"      value="com.mysql.cj.jdbc.Driver"/>
         <property name="openjpa.ConnectionUserName"        value="demo"/>
         <property name="openjpa.ConnectionPassword"        value="pwd"/>
 
@@ -68,7 +68,7 @@
     	<class>org.apache.openjpa.trader.domain.Trade</class>
     	<class>org.apache.openjpa.trader.domain.Stock</class>
         <properties>
-        <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+        <property name="openjpa.ConnectionDriverName" value="com.mysql.cj.jdbc.Driver"/>
         <property name="openjpa.ConnectionURL" value="jdbc:mysql://localhost/exchange"/>
         <property name="openjpa.ConnectionUserName" value="root"/>
         <property name="openjpa.ConnectionPassword" value=""/>
@@ -90,7 +90,7 @@
     	<class>org.apache.openjpa.trader.domain.Trade</class>
     	<class>org.apache.openjpa.trader.domain.Stock</class>
         <properties>
-        <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+        <property name="openjpa.ConnectionDriverName" value="com.mysql.cj.jdbc.Driver"/>
         <property name="openjpa.ConnectionURL" value="jdbc:mysql://opentrader.cxlsv2qt7orp.us-east-1.rds.amazonaws.com:3306/exchange"/>
         <property name="openjpa.ConnectionUserName" value="ppoddar"/>
         <property name="openjpa.ConnectionPassword" value="password"/>
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
index 988f05857b..4a138f7af3 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
@@ -147,7 +147,7 @@ public MySQLDictionary() {
             "INTEGER", "INTERVAL", "INTO", "IS", "ITERATE", "JOIN", "KEY", "KEYS", "KILL", "LEADING", "LEAVE", "LEFT", "LIKE",
             "LIMIT", "LINES", "LOAD", "LOCALTIME", "LOCALTIMESTAMP", "LOCK", "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY",
             "MATCH", "MAXVALUE", "MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MIDDLEINT", "MINUTE_MICROSECOND", "MINUTE_SECOND",
-            "MOD", "MODIFIES", "NATURAL", "NO_WRITE_TO_BINLOG", "NOT", "NULL", "NUMERIC", "ON", "OPTIMIZE", "OPTION", "OPTIONALLY",
+            "MOD", "MODIFIES", "NATURAL", "NO_WRITE_TO_BINLOG", "NOT", "NTILE", "NULL", "NUMERIC", "ON", "OPTIMIZE", "OPTION", "OPTIONALLY",
             "OR", "ORDER", "OUT", "OUTER", "OUTFILE", "PARTITION", "PRECISION", "PRIMARY", "PROCEDURE", "PURGE", "RANGE", "READ",
             "READS", "REAL", "REFERENCES", "REGEXP", "RELEASE", "RENAME", "REPEAT", "REPLACE", "REQUIRE", "RESIGNAL", "RESTRICT",
             "RETURN", "REVOKE", "RIGHT", "RLIKE", "SCHEMA", "SCHEMAS", "SECOND_MICROSECOND", "SENSITIVE", "SEPARATOR", "SET",
diff --git a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties
index a97f1339d4..dc27ebc437 100644
--- a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties
+++ b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties
@@ -185,7 +185,7 @@ ConnectionDriverName-values: org.hsqldb.jdbcDriver,org.hsql.jdbcDriver,\
 	org.h2.Driver,\
 	COM.cloudscape.core.JDBCDriver,in.co.daffodil.db.jdbc.DaffodilDBDriver,\
 	com.ddtek.jdbc.db2.DB2Driver,interbase.interclient.Driver,\
-	com.mysql.jdbc.Driver,com.ddtek.jdbc.oracle.OracleDriver,\
+	com.mysql.cj.jdbc.Driver,com.ddtek.jdbc.oracle.OracleDriver,\
 	org.postgresql.Driver,com.pointbase.jdbc.jdbcUniversalDriver,\
 	org.sourceforge.jxdbcon.JXDBConDriver,\
 	com.ddtek.jdbc.sqlserver.SQLServerDriver,com.jnetdirect.jsql.JSQLDriver,\
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
index d019f74e77..c204b1f7fb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
@@ -34,7 +34,7 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
-// -ea -Dopenjpa.ConnectionDriverName=com.mysql.jdbc.Driver -Dopenjpa.ConnectionPassword=openjpatst
+// -ea -Dopenjpa.ConnectionDriverName=com.mysql.cj.jdbc.Driver -Dopenjpa.ConnectionPassword=openjpatst
 // -Dopenjpa.ConnectionURL=jdbc:mysql://localhost:3306/openjpatst -Dopenjpa.ConnectionUserName=openjpatst
 public class TestExplicitAccess extends SingleEMFTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java
index 637503a13f..ed153df490 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java
@@ -29,6 +29,7 @@
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.H2Dictionary;
 import org.apache.openjpa.jdbc.sql.HSQLDictionary;
+import org.apache.openjpa.jdbc.sql.MySQLDictionary;
 import org.apache.openjpa.jdbc.sql.PostgresDictionary;
 import org.apache.openjpa.jdbc.sql.SQLServerDictionary;
 import org.apache.openjpa.jdbc.sql.SybaseDictionary;
@@ -98,7 +99,7 @@ public void testJDBCEscape() {
                 "select a from Employee a where a.hireTimestamp >= {ts '2009-08-25 00:00:00.123456'}",
                 "select {t '00:00:00'}, a.empId from Employee a",
             };
-        } else if (dict instanceof PostgresDictionary || dict instanceof H2Dictionary) {
+        } else if (dict instanceof PostgresDictionary || dict instanceof H2Dictionary || dict instanceof MySQLDictionary) {
             jpql = new String[] {
                 "select a from Employee a where a.hireDate >= {d '2009-08-25'}",
                 "select a from Employee a where a.hireDate >= {d '2009-8-5'}",
diff --git a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/reservedwords/sql_reserved_words.txt b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/reservedwords/sql_reserved_words.txt
index 0504b780d1..a140bdaed5 100644
--- a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/reservedwords/sql_reserved_words.txt
+++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/reservedwords/sql_reserved_words.txt
@@ -480,6 +480,7 @@ NOTHING
 NOTIFY
 NOTNULL
 NOWAIT
+NTILE
 NULL
 NULLABLE
 NULLIF
diff --git a/openjpa-project/BUILDING.txt b/openjpa-project/BUILDING.txt
index e2bbd6a289..7deeb53db7 100644
--- a/openjpa-project/BUILDING.txt
+++ b/openjpa-project/BUILDING.txt
@@ -198,7 +198,7 @@ To run the tests in the debugger simply add the following JVM properties
  -ea -Dopenjpa.ConnectionURL=jdbc:derby:target/database/openjpa-derby-database;create=true -Dopenjpa.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver
 
 For running against a MySQL Docker installation:
- -ea -Dopenjpa.ConnectionDriverName=com.mysql.jdbc.Driver -Dopenjpa.ConnectionURL=jdbc:mysql://localhost:3306/openjpatst -Dopenjpa.ConnectionUserName=openjpatst -Dopenjpa.ConnectionPassword=openjpatst
+ -ea -Dopenjpa.ConnectionDriverName=com.mysql.cj.jdbc.Driver -Dopenjpa.ConnectionURL=jdbc:mysql://localhost:3306/openjpatst -Dopenjpa.ConnectionUserName=openjpatst -Dopenjpa.ConnectionPassword=openjpatst
 
 Running against a PostgreSQL Docker installation:
  -ea -Dopenjpa.ConnectionDriverName=org.postgresql.Driver -Dopenjpa.ConnectionURL=jdbc:postgresql://localhost:5432/openjpatst -Dopenjpa.ConnectionUserName=postgres -Dopenjpa.ConnectionPassword=postgres
diff --git a/openjpa-project/src/doc/manual/ref_guide_slice.xml b/openjpa-project/src/doc/manual/ref_guide_slice.xml
index ef06dc8c8b..143d979c43 100644
--- a/openjpa-project/src/doc/manual/ref_guide_slice.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_slice.xml
@@ -365,7 +365,7 @@
        For example, the following configuration will use two different JDBC
        drivers for slice <classname>One</classname> and <classname>Two</classname>.
        <programlisting>
-        <![CDATA[<property name="openjpa.slice.One.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+        <![CDATA[<property name="openjpa.slice.One.ConnectionDriverName" value="com.mysql.cj.jdbc.Driver"/>
         <property name="openjpa.slice.Two.ConnectionDriverName" value="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"/>]]>
        </programlisting>
       </para>
@@ -378,13 +378,13 @@
          <property name="openjpa.slice.Two.ConnectionURL"          value="jdbc:mysql:localhost//slice2"/>
          <property name="openjpa.slice.Three.ConnectionURL"        value="jdbc:oracle:localhost//slice3"/>
 
-         <property name="openjpa.ConnectionDriverName"     value="com.mysql.jdbc.Driver"/>
+         <property name="openjpa.ConnectionDriverName"     value="com.mysql.cj.jdbc.Driver"/>
          <property name="openjpa.slice.Three.ConnectionDriverName" value="oracle.jdbc.Driver"/>]]>
         </programlisting>
         In this example, <classname>Three</classname> will use slice-specific
         <classname>oracle.jdbc.Driver</classname> driver while slice
         <classname>One</classname> and <classname>Two</classname> will use
-        the driver <classname>com.mysql.jdbc.Driver</classname> as
+        the driver <classname>com.mysql.cj.jdbc.Driver</classname> as
         specified by <classname>openjpa.ConnectionDriverName</classname>
         property value.
     </para>
diff --git a/openjpa-project/src/doc/manual/supported_databases.xml b/openjpa-project/src/doc/manual/supported_databases.xml
index b6332e5960..852c53fbec 100644
--- a/openjpa-project/src/doc/manual/supported_databases.xml
+++ b/openjpa-project/src/doc/manual/supported_databases.xml
@@ -155,13 +155,13 @@ users, but may not support every feature of this release, please refer to the
                         <link linkend="dbsupport_mysql">MySQL</link>
                     </entry>
                     <entry colname="dbversion">
-                        5.0.26, 5.1.6, 5.7
+                        5.0.26, 5.1.6, 5.7, 8.0.x
                     </entry>
                     <entry colname="drivname">
                         MySQL Driver
                     </entry>
                     <entry colname="drivversion">
-                        5.1.6, 5.1.47
+                        5.1.6, 5.1.47, 8.0.29
                     </entry>
                 </row>
                 <row>
@@ -1135,7 +1135,7 @@ Using the Sun JDBC-ODBC bridge to connect is not supported.
                 Example properties for MySQL
             </title>
 <programlisting>
-openjpa.ConnectionDriverName: com.mysql.jdbc.Driver
+openjpa.ConnectionDriverName: com.mysql.cj.jdbc.Driver
 openjpa.ConnectionURL: jdbc:mysql://SERVER_NAME/DB_NAME
 </programlisting>
         </example>
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index 19e03c1855..3449d33ad7 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -82,14 +82,14 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                     <version>${mysql.connector.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
-                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
+                <connection.driver.name>com.mysql.cj.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.mysql.url}</connection.url>
                 <connection.username>${openjpa.mysql.username}</connection.username>
                 <connection.password>${openjpa.mysql.password}</connection.password>
diff --git a/openjpa-slice/src/test/resources/META-INF/persistence.xml b/openjpa-slice/src/test/resources/META-INF/persistence.xml
index 543b6bde38..435e40984e 100644
--- a/openjpa-slice/src/test/resources/META-INF/persistence.xml
+++ b/openjpa-slice/src/test/resources/META-INF/persistence.xml
@@ -136,16 +136,16 @@
    <persistence-unit name="mysql">
       <properties>
          <property name="openjpa.BrokerFactory" value="slice"/>
-         <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+         <property name="openjpa.ConnectionDriverName" value="com.mysql.cj.jdbc.Driver"/>
 
          <property name="openjpa.slice.Names" value="One,Two"/>
          <property name="openjpa.slice.DistributionPolicy" value="org.apache.openjpa.slice.policy.UserDistributionPolicy"/>
 
          <property name="openjpa.ConnectionUserName"        value="root"/>
          <property name="openjpa.ConnectionPassword"        value=""/>
-         <property name="openjpa.slice.One.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+         <property name="openjpa.slice.One.ConnectionDriverName" value="com.mysql.cj.jdbc.Driver"/>
          <property name="openjpa.slice.One.ConnectionURL" value="jdbc:mysql://localhost/slice1"/>
-         <property name="openjpa.slice.Two.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+         <property name="openjpa.slice.Two.ConnectionDriverName" value="com.mysql.cj.jdbc.Driver"/>
          <property name="openjpa.slice.Two.ConnectionURL" value="jdbc:mysql://localhost/slice2"/>
 
          <property name="openjpa.Multithreaded" value="false"/>
@@ -236,7 +236,7 @@
    <persistence-unit name="car.mysql">
       <properties>
          <property name="openjpa.BrokerFactory" value="slice"/>
-         <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+         <property name="openjpa.ConnectionDriverName" value="com.mysql.cj.jdbc.Driver"/>
 
          <property name="openjpa.slice.Names" value="BMW,Honda,Ford"/>
 
@@ -288,10 +288,10 @@
 
          <property name="openjpa.ConnectionUserName"        value="root"/>
          <property name="openjpa.ConnectionPassword"        value=""/>
-         <property name="openjpa.slice.S1.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver,Url=jdbc:mysql://localhost/S1,MaxTotal=4"/>
-         <property name="openjpa.slice.S2.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver,Url=jdbc:mysql://localhost/S2,MaxTotal=4"/>
-         <property name="openjpa.slice.S3.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver,Url=jdbc:mysql://localhost/S3,MaxTotal=4"/>
-         <property name="openjpa.slice.S4.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver,Url=jdbc:mysql://localhost/S4,MaxTotal=4"/>
+         <property name="openjpa.slice.S1.ConnectionProperties" value="DriverClassName=com.mysql.cj.jdbc.Driver,Url=jdbc:mysql://localhost/S1,MaxTotal=4"/>
+         <property name="openjpa.slice.S2.ConnectionProperties" value="DriverClassName=com.mysql.cj.jdbc.Driver,Url=jdbc:mysql://localhost/S2,MaxTotal=4"/>
+         <property name="openjpa.slice.S3.ConnectionProperties" value="DriverClassName=com.mysql.cj.jdbc.Driver,Url=jdbc:mysql://localhost/S3,MaxTotal=4"/>
+         <property name="openjpa.slice.S4.ConnectionProperties" value="DriverClassName=com.mysql.cj.jdbc.Driver,Url=jdbc:mysql://localhost/S4,MaxTotal=4"/>
 
          <property name="openjpa.jdbc.DBDictionary"        value="mysql"/>
          <property name="openjpa.Multithreaded" value="false"/>
@@ -311,7 +311,7 @@
 
          <property name="openjpa.ConnectionUserName"        value="root"/>
          <property name="openjpa.ConnectionPassword"        value=""/>
-         <property name="openjpa.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver,Url=jdbc:mysql://localhost/S,MaxTotal=4"/>
+         <property name="openjpa.ConnectionProperties" value="DriverClassName=com.mysql.cj.jdbc.Driver,Url=jdbc:mysql://localhost/S,MaxTotal=4"/>
 
          <property name="openjpa.jdbc.DBDictionary"        value="mysql"/>
          <property name="openjpa.Multithreaded" value="false"/>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java
index e980c1f346..e8d10a8e0c 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java
@@ -120,7 +120,7 @@ public abstract class AbstractOpenJpaMojo extends AbstractMojo
      * Sample:
      * <pre>
      * &lt;connectionProperties&gt;
-     *   driverClass=com.mysql.jdbc.Driver,
+     *   driverClass=com.mysql.cj.jdbc.Driver,
      *   jdbcUrl=jdbc:mysql://localhost/mydatabase,
      *   user=root,
      *   password=,
diff --git a/openjpa-tools/openjpa-maven-plugin/src/site/apt/examples/credentials.apt b/openjpa-tools/openjpa-maven-plugin/src/site/apt/examples/credentials.apt
index 5793217d17..bc55e4c6c1 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/site/apt/examples/credentials.apt
+++ b/openjpa-tools/openjpa-maven-plugin/src/site/apt/examples/credentials.apt
@@ -39,7 +39,7 @@ Specifying connection settings in the plugin section
           <sqlFile>${project.build.directory}/database.sql</sqlFile>
           <connectionDriverName>com.mchange.v2.c3p0.ComboPooledDataSource</connectionDriverName>
           <connectionProperties>
-            driverClass=com.mysql.jdbc.Driver,
+            driverClass=com.mysql.cj.jdbc.Driver,
             jdbcUrl=jdbc:mysql://localhost/TissExamples,
             user=root,
             password=,
@@ -79,9 +79,9 @@ Specifying connection settings in the plugin section
             <version>0.9.1</version>
           </dependency>
           <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.11</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.0.31</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 27df59a037..78faf11e62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache</groupId>
       <artifactId>apache</artifactId>
-      <version>23</version>
+      <version>29</version>
     </parent>
 
     <groupId>org.apache.openjpa</groupId>
@@ -79,7 +79,7 @@
         <!-- common JDBC driver versions -->
         <derby.version>10.14.2.0</derby.version>
         <hsqldb.version>2.5.1</hsqldb.version>
-        <mysql.connector.version>5.1.49</mysql.connector.version>
+        <mysql.connector.version>8.0.31</mysql.connector.version>
         <mariadb.connector.version>2.7.2</mariadb.connector.version>
         <postgresql.connector.version>42.5.1</postgresql.connector.version>
         <mssql.connector.version>11.2.1.jre8</mssql.connector.version>
@@ -600,14 +600,14 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                     <version>${mysql.connector.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
-                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
+                <connection.driver.name>com.mysql.cj.jdbc.Driver</connection.driver.name>
                 <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
                 <connection.url>${openjpa.mysql.url}</connection.url>
                 <connection.username>${openjpa.mysql.username}</connection.username>
@@ -629,19 +629,19 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                     <version>${mysql.connector.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
-                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
+                <connection.driver.name>com.mysql.cj.jdbc.Driver</connection.driver.name>
 
                 <!-- default settings for local docker -->
                 <docker.external.mysql.port>3306</docker.external.mysql.port>
                 <openjpa.mysql.dbname>openjpatst</openjpa.mysql.dbname>
-                <openjpa.mysql.url>jdbc:mysql://localhost:${docker.external.mysql.port}/${openjpa.mysql.dbname}?useSSL=false</openjpa.mysql.url>
+                <openjpa.mysql.url>jdbc:mysql://localhost:${docker.external.mysql.port}/${openjpa.mysql.dbname}?useSSL=false&amp;allowPublicKeyRetrieval=true</openjpa.mysql.url>
                 <openjpa.mysql.username>openjpatst</openjpa.mysql.username>
                 <openjpa.mysql.password>openjpatst</openjpa.mysql.password>
 
@@ -655,7 +655,7 @@
                 <dbcp.maxIdle>5</dbcp.maxIdle>
                 <dbcp.minIdle>0</dbcp.minIdle>
 
-                <mysql.server.version>5.7</mysql.server.version>
+                <mysql.server.version>8.0</mysql.server.version>
             </properties>
 
             <build>
@@ -1806,8 +1806,8 @@
                 <version>${derby.version}</version>
             </dependency>
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
                 <version>${mysql.connector.version}</version>
             </dependency>
             <dependency>