diff --git a/guava-shaded/pom.xml b/guava-shaded/pom.xml
index a4034ada4d5..377774e59a8 100644
--- a/guava-shaded/pom.xml
+++ b/guava-shaded/pom.xml
@@ -146,7 +146,7 @@
         with Class.forName(). In the end, more packages will be imported in MANIFEST.MF
         and OSGi integration tests will break.
         -->
-        <version>3.5.1</version>
+        <version>6.0.0</version>
         <extensions>true</extensions>
         <executions>
           <execution>
diff --git a/pom.xml b/pom.xml
index ce66f1fc541..c8c3a7e3f39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -576,7 +576,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>5.1.9</version>
+          <version>6.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.revapi</groupId>