From c82a13d18e324d3dc1b7cbd37e8891f74436efa3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 29 Oct 2018 10:01:41 +0000
Subject: [PATCH] Upgrade to Byte Buddy 1.9.3

Closes gh-14866
---
 spring-boot-project/spring-boot-dependencies/pom.xml           | 2 +-
 spring-boot-project/spring-boot-starters/pom.xml               | 3 +++
 .../spring-boot-starter-data-elasticsearch/pom.xml             | 1 +
 .../spring-boot-starters/spring-boot-starter-jersey/pom.xml    | 1 +
 .../spring-boot-starters/spring-boot-starter-jetty/pom.xml     | 2 +-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 7a163ad8b9..42250446d2 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -42,7 +42,7 @@
 		<assertj.version>3.11.1</assertj.version>
 		<atomikos.version>4.0.6</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>
-		<byte-buddy.version>1.9.1</byte-buddy.version>
+		<byte-buddy.version>1.9.3</byte-buddy.version>
 		<caffeine.version>2.6.2</caffeine.version>
 		<cassandra-driver.version>3.6.0</cassandra-driver.version>
 		<classmate.version>1.4.0</classmate.version>
diff --git a/spring-boot-project/spring-boot-starters/pom.xml b/spring-boot-project/spring-boot-starters/pom.xml
index 0261f887f7..14b0562fb5 100644
--- a/spring-boot-project/spring-boot-starters/pom.xml
+++ b/spring-boot-project/spring-boot-starters/pom.xml
@@ -145,6 +145,9 @@
 						</goals>
 						<configuration>
 							<failBuildInCaseOfConflict>true</failBuildInCaseOfConflict>
+							<ignoredClassPatterns>
+ 								<ignoredClassPattern>.*module-info</ignoredClassPattern>
+ 							</ignoredClassPatterns>
 							<ignoredResourcePatterns>
 								<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
 							</ignoredResourcePatterns>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
index 8d9fb10529..fae8c7fc57 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
@@ -49,6 +49,7 @@
 						<configuration>
 							<ignoredClassPatterns>
 								<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
+								<ignoredClassPattern>.*module-info</ignoredClassPattern>
 							</ignoredClassPatterns>
 							<ignoredResourcePatterns>
 								<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml
index b4d0ff0fce..f3adf2ac4a 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml
@@ -120,6 +120,7 @@
 							<ignoredClassPatterns>
 								<ignoredClassPattern>org.aopalliance.*</ignoredClassPattern>
 								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
+								<ignoredClassPattern>.*module-info</ignoredClassPattern>
 							</ignoredClassPatterns>
 						</configuration>
 					</execution>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml
index 0d8fc32869..86e7283596 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml
@@ -61,7 +61,7 @@
 						</goals>
 						<configuration>
 							<ignoredClassPatterns>
-								<ignoredClassPattern>^module-info$</ignoredClassPattern>
+								<ignoredClassPattern>.*module-info</ignoredClassPattern>
 							</ignoredClassPatterns>
 							<ignoredResourcePatterns>
 								<ignoredResourcePattern>about.html</ignoredResourcePattern>