Update bnd builder Gradle plugin version to 7.2.3

Vampire · Vampire · commit b2ca71448fe2 · 2026-03-31T17:11:55.000+02:00
diff --git a/gradle/build-logic/src/main/kotlin/net/kautler/osgi.gradle.kts b/gradle/build-logic/src/main/kotlin/net/kautler/osgi.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Björn Kautler
+ * Copyright 2019-2025 Björn Kautler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,40 +16,32 @@
 
 package net.kautler
 
-import aQute.bnd.gradle.BundleTaskConvention
-
 plugins {
     id("biz.aQute.bnd.builder")
 }
 
 tasks.jar {
-    @Suppress("DEPRECATION")
-    withConvention(BundleTaskConvention::class) {
+    bundle {
+        properties.put("version", archiveVersion)
         bnd(
-            archiveVersion.map { version ->
-                mapOf(
-                    "Import-Package" to listOf(
-                        listOf(
-                            "org.javacord.*",
-                            "resolution:=optional"
-                        ).joinToString(";"),
-                        listOf(
-                            "net.dv8tion.jda.*",
-                            "resolution:=optional"
-                        ).joinToString(";"),
-                        "*"
-                    ).joinToString(),
-                    "Export-Package" to listOf(
-                        "net.kautler.command.api.*",
-                        "version=$version",
-                        "-noimport:=true"
+            mapOf(
+                "Import-Package" to listOf(
+                    listOf(
+                        "org.javacord.*",
+                        "resolution:=optional"
+                    ).joinToString(";"),
+                    listOf(
+                        "net.dv8tion.jda.*",
+                        "resolution:=optional"
                     ).joinToString(";"),
-                    // work-around for https://github.com/bndtools/bnd/issues/2227
-                    "-fixupmessages" to """^Classes found in the wrong directory: \\{META-INF/versions/9/module-info\\.class=module-info}$"""
-                )
-                    .entries
-                    .joinToString("\n") { (key, value) -> "$key=$value" }
-            }
+                    "*"
+                ).joinToString(),
+                "Export-Package" to listOf(
+                    "net.kautler.command.api.*",
+                    "version=\${version}",
+                    "-noimport:=true"
+                ).joinToString(";")
+            )
         )
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ jda = "4.4.0_352"
 log4j = "2.20.0"
 
 build-codenarc = "3.7.0-groovy-4.0"
-build-gradle-plugin-bndBuilder = "5.3.0"
+build-gradle-plugin-bndBuilder = "7.2.3"
 # fix or remove component metadata rule in gradle/build-logic/settings.gradle.kts on update
 build-gradle-plugin-github = "3.0.1"
 build-gradle-plugin-nexus-publish = "0.4.0"
