Skip to content

Commit

Permalink
relax osgi version requirement for guava (fixes #1160)
Browse files Browse the repository at this point in the history
The minimum version is the first Guava release with JPMS support by
including Automatic-Module-Name in the manifest.

Also removed workaround for ops4j/org.ops4j.pax.exam#1043
  • Loading branch information
ben-manes committed Sep 5, 2023
1 parent 5180d7c commit 64251f0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -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 {
Expand Down
6 changes: 2 additions & 4 deletions guava/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
Expand Down

0 comments on commit 64251f0

Please sign in to comment.