diff --git a/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts
index d8a1c8d512..818012ee24 100644
--- a/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts
@@ -1,5 +1,4 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
-import com.github.benmanes.gradle.versions.reporter.PlainTextReporter
 
 plugins {
   id("com.github.ben-manes.versions")
@@ -20,18 +19,6 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
     force(libs.guice)
     force(libs.bundles.coherence.get())
   }
-  outputFormatter {
-    val reporter = PlainTextReporter(project, revision, gradleReleaseChannel)
-    exceeded.dependencies.removeAll { dependency ->
-      if (dependency.group?.startsWith("org.ops4j") == true) {
-        current.dependencies += dependency
-        true
-      } else {
-        false
-      }
-    }
-    reporter.write(System.out, this)
-  }
 }
 
 fun isNonStable(version: String): Boolean {
diff --git a/guava/build.gradle.kts b/guava/build.gradle.kts
index 11025598a3..a11bae1075 100644
--- a/guava/build.gradle.kts
+++ b/guava/build.gradle.kts
@@ -38,10 +38,8 @@ tasks.jar {
   bundle.bnd(mapOf(
     "Bundle-SymbolicName" to "com.github.ben-manes.caffeine.guava",
     "Import-Package" to listOf(
-      "com.google.common.cache",
-      "com.google.common.util.concurrent",
-      "com.github.benmanes.caffeine.cache",
-      "com.github.benmanes.caffeine.cache.stats").joinToString(","),
+      "com.github.benmanes.caffeine.*",
+      "com.google.common.*;version=23.2").joinToString(","),
     "Export-Package" to "com.github.benmanes.caffeine.guava",
     "Automatic-Module-Name" to "com.github.benmanes.caffeine.guava"))
 }