[Git][java-team/bnd][master] Restored the static import of BndUtils.unwrap() in BundleTaskConvention

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / bnd


Commits:
a2a604f6 by Emmanuel Bourg at 2026-09-22T14:36:13+02:00
Restored the static import of BndUtils.unwrap() in BundleTaskConvention

- - - - -


2 changed files:

- debian/changelog
- debian/patches/gradle-compatibility.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+bnd (5.3.0-2) unstable; urgency=medium
+
+  * Restored the static import of BndUtils.unwrap() in BundleTaskConvention
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Sep 2026 14:35:54 +0200
+
 bnd (5.3.0-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/patches/gradle-compatibility.patch
=====================================
@@ -1451,19 +1451,18 @@ Forwarded: not-needed
              version {
 --- a/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BundleTaskConvention.groovy
 +++ b/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BundleTaskConvention.groovy
-@@ -23,10 +23,8 @@
+@@ -23,9 +23,8 @@
  
  package aQute.bnd.gradle
  
 -import static aQute.bnd.gradle.BndUtils.builtBy
 -import static aQute.bnd.gradle.BndUtils.jarLibraryElements
  import static aQute.bnd.gradle.BndUtils.logReport
--import static aQute.bnd.gradle.BndUtils.unwrap
 +import static aQute.bnd.gradle.BndUtils.builtBy
+ import static aQute.bnd.gradle.BndUtils.unwrap
  
  import java.util.Properties
- import java.util.jar.Manifest
-@@ -46,9 +44,7 @@
+@@ -46,9 +45,7 @@
  import org.gradle.api.Task
  import org.gradle.api.file.ConfigurableFileCollection
  import org.gradle.api.file.ProjectLayout
@@ -1473,7 +1472,7 @@ Forwarded: not-needed
  import org.gradle.api.provider.Provider
  import org.gradle.api.tasks.Input
  import org.gradle.api.tasks.InputFile
-@@ -62,9 +58,8 @@
+@@ -62,9 +59,8 @@
    private final ProjectLayout layout
    private final ObjectFactory objects
    private final File buildFile
@@ -1485,7 +1484,7 @@ Forwarded: not-needed
    private final ConfigurableFileCollection classpathCollection
    private boolean classpathModified
    private SourceSet sourceSet
-@@ -82,18 +77,14 @@
+@@ -82,18 +78,14 @@
      layout = project.getLayout()
      objects = project.getObjects()
      buildFile = project.getBuildFile()
@@ -1508,7 +1507,7 @@ Forwarded: not-needed
    }
  
    /**
-@@ -103,7 +94,7 @@
+@@ -103,7 +95,7 @@
     */
    @InputFile
    @Optional
@@ -1517,7 +1516,7 @@ Forwarded: not-needed
      return bndfile
    }
    /**
-@@ -114,7 +105,7 @@
+@@ -114,7 +106,7 @@
     * Project.file().
     */
    public void setBndfile(Object file) {
@@ -1526,7 +1525,7 @@ Forwarded: not-needed
    }
  
    /**
-@@ -125,15 +116,15 @@
+@@ -125,15 +117,15 @@
     */
    @Input
    @Optional
@@ -1545,7 +1544,7 @@ Forwarded: not-needed
       bnd(line)
    }
  
-@@ -142,7 +133,7 @@
+@@ -142,7 +134,7 @@
     * {@link Provider<? extends CharSequence>}.
     */
    public void setBnd(Provider<? extends CharSequence> lines) {
@@ -1554,7 +1553,7 @@ Forwarded: not-needed
      bnd(lines)
    }
  
-@@ -150,7 +141,9 @@
+@@ -150,7 +142,9 @@
     * Add instructions to the bnd property from a list of multi-line strings.
     */
    public void bnd(CharSequence... lines) {
@@ -1565,7 +1564,7 @@ Forwarded: not-needed
    }
  
    /**
-@@ -158,14 +151,14 @@
+@@ -158,14 +152,14 @@
     * using a {@link Provider<? extends CharSequence>}.
     */
    public void bnd(Provider<? extends CharSequence> lines) {
@@ -1582,7 +1581,7 @@ Forwarded: not-needed
       bnd(map)
    }
  
-@@ -173,9 +166,9 @@
+@@ -173,9 +167,9 @@
     * Add instructions to the bnd property from a map.
     */
    public void bnd(Map<String, ?> map) {
@@ -1595,7 +1594,7 @@ Forwarded: not-needed
    }
  
    /**
-@@ -217,7 +210,6 @@
+@@ -217,7 +211,6 @@
     */
    public void setSourceSet(SourceSet sourceSet) {
      this.sourceSet = sourceSet
@@ -1603,7 +1602,7 @@ Forwarded: not-needed
      if (!classpathModified) {
        setClasspath(sourceSet.compileClasspath)
        classpathModified = false
-@@ -270,11 +262,12 @@
+@@ -270,11 +263,12 @@
            throw new GradleException('Sub-bundles are not supported by this task')
          }
  
@@ -1621,7 +1620,7 @@ Forwarded: not-needed
  
          // Include entire contents of Jar task generated jar (except the manifest)
          File archiveCopyFile = new File(temporaryDir, archiveFileName)
-@@ -287,7 +280,7 @@
+@@ -287,7 +281,7 @@
          builder.setJar(bundleJar)
  
          // set builder classpath
@@ -1630,7 +1629,7 @@ Forwarded: not-needed
            if (!file.exists()) {
              return false
            }
-@@ -308,7 +301,7 @@
+@@ -308,7 +302,7 @@
          logger.debug 'builder classpath: {}', builder.getClasspath()*.getSource()
  
          // set builder sourcepath



View it on GitLab: https://salsa.debian.org/java-team/bnd/-/commit/a2a604f6699261c70c74eeba9487091e6339cc38

-- 
View it on GitLab: https://salsa.debian.org/java-team/bnd/-/commit/a2a604f6699261c70c74eeba9487091e6339cc38
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260922/23fae7f5/attachment.htm>