diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ff3226975..a794aa8a747 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
## UNRELEASED
### Fixed
+- Fixed Guava shading in `jdbc` module
### Changed
diff --git a/core/pom.xml b/core/pom.xml
index 0238b2b2f64..a1e128c8466 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,6 +15,18 @@
TestContainers Core
+
+ junit
+ junit
+ 4.12
+
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.25
+
+
com.github.docker-java
docker-java
diff --git a/modules/jdbc/pom.xml b/modules/jdbc/pom.xml
index 0a3178d8e01..7027cac5356 100644
--- a/modules/jdbc/pom.xml
+++ b/modules/jdbc/pom.xml
@@ -22,8 +22,53 @@
com.google.guava
guava
18.0
- provided
+
+
+
+ maven-shade-plugin
+ 3.0.0
+
+
+ package
+
+ shade
+
+
+
+
+
+
+ com.google
+ org.testcontainers.shaded.com.google
+
+
+
+
+ com.google.guava:*
+
+
+ false
+ false
+
+
+ *:*
+
+ META-INF/NOTICE
+ META-INF/LICENSE
+ META-INF/DEPENDENCIES
+ META-INF/maven/
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 390827b249b..bf158718386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,12 +69,6 @@
-
- junit
- junit
- 4.12
-
-
org.projectlombok
@@ -83,12 +77,6 @@
provided
-
-
- org.slf4j
- slf4j-api
- 1.7.25
-
ch.qos.logback
logback-classic
diff --git a/shade-test/pom.xml b/shade-test/pom.xml
index bfbca79b8a1..0e761a940e3 100644
--- a/shade-test/pom.xml
+++ b/shade-test/pom.xml
@@ -19,4 +19,13 @@
service-lookup-dropwizard
jar-file
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
\ No newline at end of file