Merge pull request #14062 from Spencer Gibb

* gh-14062: Exclude protobuf-java from mysql-connector-java
2018-08-14 20:01:17 +01:00
parent a8a75f1bbb 8427341480
commit 0fb02ab6a0
1 changed files with 6 additions and 0 deletions
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -1097,6 +1097,12 @@
 				<groupId>mysql</groupId>
 				<artifactId>mysql-connector-java</artifactId>
 				<version>${mysql.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.protobuf</groupId>
+						<artifactId>protobuf-java</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>net.bytebuddy</groupId>