Skip to content

Commit 8fd7bc7

Browse files
authored
Merge pull request #2388 from ControlSystemStudio/mysql_803
Update MySQL connector version
2 parents 969e8ba + 1509681 commit 8fd7bc7

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

dependencies/phoebus-target/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<classpathentry exported="true" kind="lib" path="target/lib/lz4-java-1.4.1.jar"/>
115115
<classpathentry exported="true" kind="lib" path="target/lib/mimepull-1.9.3.jar"/>
116116
<classpathentry exported="true" kind="lib" path="target/lib/mockito-core-2.23.4.jar"/>
117-
<classpathentry exported="true" kind="lib" path="target/lib/mysql-connector-java-5.1.45.jar"/>
117+
<classpathentry exported="true" kind="lib" path="target/lib/mysql-connector-java-8.0.30.jar"/>
118118
<classpathentry exported="true" kind="lib" path="target/lib/objenesis-2.6.jar"/>
119119
<classpathentry exported="true" kind="lib" path="target/lib/ojdbc8-12.2.0.1.jar"/>
120120
<classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.jgit-5.0.3.201809091024-r.jar"/>

dependencies/phoebus-target/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<dependency>
161161
<groupId>mysql</groupId>
162162
<artifactId>mysql-connector-java</artifactId>
163-
<version>5.1.45</version>
163+
<version>${mysql.version}</version>
164164
</dependency>
165165
<dependency>
166166
<groupId>org.postgresql</groupId>

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
<batik.version>1.14</batik.version>
6666
<mockito.version>2.23.4</mockito.version>
6767
<postgresql.driver.version>42.2.9</postgresql.driver.version>
68+
<!-- When connections to older MySQL server fail because of CLIENT_PLUGIN_AUTH, downgrade to 5.1.45 -->
69+
<mysql.version>8.0.30</mysql.version>
6870
<jetty.version>9.4.30.v20200611</jetty.version>
6971
<apache.commons.math.version>3.6.1</apache.commons.math.version>
7072
<junit.version>4.13.1</junit.version>

services/archive-engine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>mysql</groupId>
7373
<artifactId>mysql-connector-java</artifactId>
74-
<version>5.1.45</version>
74+
<version>${mysql.version}</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>org.postgresql</groupId>

0 commit comments

Comments
 (0)