Merge "ChangeArgumentParser: Remove unused change control factory"
diff --git a/Documentation/database-setup.txt b/Documentation/database-setup.txt
index 47fef6d..0788cb8 100644
--- a/Documentation/database-setup.txt
+++ b/Documentation/database-setup.txt
@@ -55,7 +55,7 @@
[[createdb_mysql]]
=== MySQL
-Requirements: MySQL version 5.1 or later.
+Requirements: MySQL version 5.5 or later.
This option is also more complicated than the H2 option. Just as with
PostgreSQL it's also recommended for larger installations.
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
index e3a1d66..7e6bf63 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
@@ -40,7 +40,7 @@
} else if (url.startsWith("jdbc:mariadb:")) {
database.set("driver", "org.mariadb.jdbc.Driver");
} else if (url.startsWith("jdbc:mysql:")) {
- database.set("driver", "com.mysql.jdbc.Driver");
+ database.set("driver", "com.mysql.cj.jdbc.Driver");
} else if (url.startsWith("jdbc:postgresql:")) {
database.set("driver", "org.postgresql.Driver");
}
diff --git a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
index 268a32a..9c02d2f 100644
--- a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
+++ b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
@@ -13,9 +13,9 @@
# limitations under the License.
[library "mysqlDriver"]
- name = MySQL Connector/J 5.1.43
- url = https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.43/mysql-connector-java-5.1.43.jar
- sha1 = dee9103eec0d877f3a21c82d4d9e9f4fbd2d6e0a
+ name = MySQL Connector/J 6.0.6
+ url = https://repo1.maven.org/maven2/mysql/mysql-connector-java/6.0.6/mysql-connector-java-6.0.6.jar
+ sha1 = 1d19b184dbc596008cc71c83596f051c3ec4097f
remove = mysql-connector-java-.*[.]jar
[library "mariadbDriver"]
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
index c274e56..5c658a8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
@@ -151,7 +151,7 @@
return "org.postgresql.Driver";
}
if (url.contains(MYSQL)) {
- return "com.mysql.jdbc.Driver";
+ return "com.mysql.cj.jdbc.Driver";
}
if (url.contains(MARIADB)) {
return "org.mariadb.jdbc.Driver";
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
index 9fc6896..a761794 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
@@ -28,7 +28,7 @@
@Inject
MySql(@GerritServerConfig Config cfg) {
- super("com.mysql.jdbc.Driver");
+ super("com.mysql.cj.jdbc.Driver");
this.cfg = cfg;
}
diff --git a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml
index cb0a256..9721e22 100644
--- a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml
+++ b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml
@@ -46,7 +46,7 @@
<Set name="password">secretkey</Set>
-->
<!-- MySQL
- <Set name="driverClassName">com.mysql.jdbc.Driver</Set>
+ <Set name="driverClassName">com.mysql.cj.jdbc.Driver</Set>
<Set name="url">jdbc:mysql://localhost/reviewdb?user=gerrit&password=secretkey</Set>
-->
<!-- MariaDB
