Rename plugin bnd

micrometer-metrics · Jan 11, 2025 · ce8a84d · ce8a84d
1 parent 09d8672
commit ce8a84d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,10 +20,10 @@ buildscript {
         classpath libs.plugin.downloadTask
         classpath libs.plugin.spotless
 
-        if (JavaLanguageVersion.current().asInt() < 17) {
+        if (javaLanguageVersion.asInt() < 17) {
             classpath libs.plugin.bnd
         } else {
-            classpath libs.plugin.bndLastest
+            classpath libs.plugin.bndForJava17
         }
 
         constraints {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -234,7 +234,7 @@ plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version
 plugin-downloadTask = { module = "de.undercouch:gradle-download-task", version = "5.6.0" }
 plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" }
 plugin-bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0"
-plugin-bndLastest = "biz.aQute.bnd:biz.aQute.bnd.gradle:7.1.0"
+plugin-bndForJava17 = "biz.aQute.bnd:biz.aQute.bnd.gradle:7.1.0"
 
 [plugins]
 kotlin19 = { id = "org.jetbrains.kotlin.jvm", version = "1.9.25" }

diff --git a/micrometer-osgi-test/build.gradle b/micrometer-osgi-test/build.gradle
@@ -26,10 +26,8 @@ dependencies {
 def testingBundle = tasks.register('testingBundle', Bundle) {
     archiveClassifier = 'tests'
     from sourceSets.test.output
-    if (JavaLanguageVersion.current().asInt() < 17) {
-        sourceSet = sourceSets.test
-    }
     bundle {
+        sourceSet = sourceSets.test
         bnd """\
             Bundle-SymbolicName: \${task.archiveBaseName}-\${task.archiveClassifier}
             Test-Cases: \${classes;HIERARCHY_INDIRECTLY_ANNOTATED;org.junit.platform.commons.annotation.Testable;CONCRETE}