12 changed files with 417 additions and 71 deletions
--- a/.aqute-bnd.metadata
+++ b/.aqute-bnd.metadata
@ -1 +1 @@
-103badefa3cb78d7e128d5485919bb21b908e3a8 SOURCES/aqute-bnd-5.2.0.tar.gz
+59d67db613000bd1144a9d1c2a4a130b89cccb15 SOURCES/aqute-bnd-6.2.0.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/aqute-bnd-5.2.0.tar.gz
+SOURCES/aqute-bnd-6.2.0.tar.gz
--- a/SOURCES/0001-Disable-removed-commands.patch
+++ b/SOURCES/0001-Disable-removed-commands.patch
@ -1,18 +1,20 @@
-diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bnd-5.2.0/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
--- aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java	2020-10-14 22:03:53.000000000 +0200
-+++ aqute-bnd-5.2.0/biz.aQute.bnd/src/aQute/bnd/main/bnd.java	2021-08-02 18:01:59.894715497 +0200
-@@ -106,7 +106,6 @@
+diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
+index a787c32..fc241a2 100644
+--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
+++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
+@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Resource;
 import aQute.bnd.osgi.Verifier;
 import aQute.bnd.osgi.eclipse.EclipseClasspath;
 import aQute.bnd.print.JarPrinter;
 -import aQute.bnd.repository.maven.provider.NexusCommand;
+ import aQute.bnd.result.Result;
 import aQute.bnd.service.Actionable;
 import aQute.bnd.service.RepositoryPlugin;
- import aQute.bnd.service.action.Action;
-@@ -3922,54 +3921,6 @@
+@@ -3921,54 +3920,6 @@ public class bnd extends Processor {
+ 		getInfo(profiles);
 	}
 
- 	/**
+-	/**
 -	 * Resolve command
 -	 *
 -	 * @throws Exception
@ -60,11 +62,10 @@ diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bn
 -		rc.close();
 -	}
 -
-	/**
+ 	/**
 	 * Export a bndrun file
 	 */
- 	interface ExportOptions extends ProjectWorkspaceOptions {
-@@ -4424,15 +4375,6 @@
+@@ -4424,15 +4375,6 @@ public class bnd extends Processor {
 		}
 	}
 
@ -80,7 +81,7 @@ diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bn
 	public Workspace getWorkspace() {
 		return workspace;
 	}
-@@ -4479,24 +4421,6 @@
+@@ -4479,24 +4421,6 @@ public class bnd extends Processor {
 
 	}
 
@ -102,6 +103,6 @@ diff -ur aqute-bnd-5.2.0.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java aqute-bn
 -		getInfo(c);
 -	}
 -
- 	@Description("Generate source code")
- 	interface GenerateOptions extends ProjectWorkspaceOptions {
- 
+ 	@Description("Shows the differences between two XML resource repositories")
+ 	public void _xmlrepodiff(XmlRepoDiffOptions options) throws Exception {
+ 		try (XmlRepoDiffCommand cmd = new XmlRepoDiffCommand(this)) {
--- a/SOURCES/aQute.libg-6.2.0.pom
+++ b/SOURCES/aQute.libg-6.2.0.pom
@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>biz.aQute.bnd</groupId>
  <artifactId>aQute.libg</artifactId>
-  <version>5.2.0</version>
+  <version>6.2.0</version>
  <description>A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only.</description>
  <name>aQute.libg</name>
  <url>https://bnd.bndtools.org/</url>
@ -23,7 +23,7 @@
    <url>https://github.com/bndtools/bnd</url>
    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.2.0.REL</tag>
+    <tag>6.2.0</tag>
  </scm>
  <developers>
    <developer>
@ -41,7 +41,7 @@
    <developer>
      <id>bjhargrave</id>
      <name>BJ Hargrave</name>
-      <email>bj@bjhargrave.com</email>
+      <email>bj@hargrave.dev</email>
      <url>https://github.com/bjhargrave</url>
      <organization>IBM</organization>
      <organizationUrl>https://developer.ibm.com</organizationUrl>
@ -67,7 +67,7 @@
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
+      <version>8.1.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
@ -79,13 +79,13 @@
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>org.osgi.util.function</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>org.osgi.util.promise</artifactId>
-      <version>1.1.1</version>
+      <version>1.2.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/SOURCES/biz.aQute.bnd-6.2.0.pom
+++ b/SOURCES/biz.aQute.bnd-6.2.0.pom
@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>biz.aQute.bnd</groupId>
  <artifactId>biz.aQute.bnd</artifactId>
-  <version>5.2.0</version>
+  <version>6.2.0</version>
  <description>This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib.</description>
  <name>biz.aQute.bnd</name>
  <url>https://bnd.bndtools.org/</url>
@ -23,7 +23,7 @@
    <url>https://github.com/bndtools/bnd</url>
    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.2.0.REL</tag>
+    <tag>6.2.0</tag>
  </scm>
  <developers>
    <developer>
@ -41,7 +41,7 @@
    <developer>
      <id>bjhargrave</id>
      <name>BJ Hargrave</name>
-      <email>bj@bjhargrave.com</email>
+      <email>bj@hargrave.dev</email>
      <url>https://github.com/bjhargrave</url>
      <organization>IBM</organization>
      <organizationUrl>https://developer.ibm.com</organizationUrl>
@ -66,8 +66,32 @@
  <dependencies>
    <dependency>
      <groupId>org.osgi</groupId>
-      <artifactId>osgi.core</artifactId>
-      <version>6.0.0</version>
+      <artifactId>org.osgi.dto</artifactId>
+      <version>1.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.resource</artifactId>
+      <version>1.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.framework</artifactId>
+      <version>1.8.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.tracker</artifactId>
+      <version>1.5.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.coordinator</artifactId>
+      <version>1.0.2</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
@ -82,46 +106,70 @@
      <version>1.1.0</version>
      <scope>provided</scope>
    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.resolver</artifactId>
+      <version>1.1.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.function</artifactId>
+      <version>1.2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.promise</artifactId>
+      <version>1.2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bnd.util</artifactId>
+      <version>6.2.0</version>
+      <scope>provided</scope>
+    </dependency>
    <dependency>
      <groupId>biz.aQute.bnd</groupId>
      <artifactId>biz.aQute.bndlib</artifactId>
-      <version>5.2.0</version>
+      <version>6.2.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>biz.aQute.bnd</groupId>
      <artifactId>biz.aQute.bnd.ant</artifactId>
-      <version>5.2.0</version>
+      <version>6.2.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>biz.aQute.bnd</groupId>
      <artifactId>biz.aQute.resolve</artifactId>
-      <version>5.2.0</version>
+      <version>6.2.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>biz.aQute.bnd</groupId>
      <artifactId>biz.aQute.repository</artifactId>
-      <version>5.2.0</version>
+      <version>6.2.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>biz.aQute.bnd</groupId>
      <artifactId>biz.aQute.bnd.exporters</artifactId>
-      <version>5.2.0</version>
+      <version>6.2.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>biz.aQute.bnd</groupId>
      <artifactId>biz.aQute.bnd.reporter</artifactId>
-      <version>5.2.0</version>
+      <version>6.2.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>biz.aQute.bnd</groupId>
      <artifactId>biz.aQute.remote.api</artifactId>
-      <version>5.2.0</version>
+      <version>6.2.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
--- a/SOURCES/biz.aQute.bnd.annotation-6.2.0.pom
+++ b/SOURCES/biz.aQute.bnd.annotation-6.2.0.pom
@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>biz.aQute.bnd</groupId>
  <artifactId>biz.aQute.bnd.annotation</artifactId>
-  <version>5.2.0</version>
+  <version>6.2.0</version>
  <description>bnd Annotations Library</description>
  <name>biz.aQute.bnd.annotation</name>
  <url>https://bnd.bndtools.org/</url>
@ -23,7 +23,7 @@
    <url>https://github.com/bndtools/bnd</url>
    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.2.0.REL</tag>
+    <tag>6.2.0</tag>
  </scm>
  <developers>
    <developer>
@ -41,7 +41,7 @@
    <developer>
      <id>bjhargrave</id>
      <name>BJ Hargrave</name>
-      <email>bj@bjhargrave.com</email>
+      <email>bj@hargrave.dev</email>
      <url>https://github.com/bjhargrave</url>
      <organization>IBM</organization>
      <organizationUrl>https://developer.ibm.com</organizationUrl>
@ -67,7 +67,7 @@
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
+      <version>8.1.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/SOURCES/biz.aQute.bnd.ant-6.2.0.pom
+++ b/SOURCES/biz.aQute.bnd.ant-6.2.0.pom
@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>biz.aQute.bnd</groupId>
+  <artifactId>biz.aQute.bnd.ant</artifactId>
+  <version>6.2.0</version>
+  <description>Bnd Ant Tasks</description>
+  <name>biz.aQute.bnd.ant</name>
+  <url>https://bnd.bndtools.org/</url>
+  <organization>
+    <name>Bndtools</name>
+    <url>https://bndtools.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>(Apache-2.0 OR EPL-2.0)</name>
+      <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url>
+      <distribution>repo</distribution>
+      <comments>This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0.</comments>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/bndtools/bnd</url>
+    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
+    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
+    <tag>6.2.0</tag>
+  </scm>
+  <developers>
+    <developer>
+      <id>pkriens</id>
+      <email>Peter.Kriens@aQute.biz</email>
+      <name>Peter Kriens</name>
+      <organization>Bndtools</organization>
+      <organizationUrl>https://github.com/bndtools</organizationUrl>
+      <roles>
+        <role>architect</role>
+        <role>developer</role>
+      </roles>
+      <timezone>1</timezone>
+    </developer>
+    <developer>
+      <id>bjhargrave</id>
+      <name>BJ Hargrave</name>
+      <email>bj@hargrave.dev</email>
+      <url>https://github.com/bjhargrave</url>
+      <organization>IBM</organization>
+      <organizationUrl>https://developer.ibm.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.annotation</artifactId>
+      <version>8.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bnd.util</artifactId>
+      <version>6.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bndlib</artifactId>
+      <version>6.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.10.12</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
--- a/SOURCES/biz.aQute.bnd.util-6.2.0.pom
+++ b/SOURCES/biz.aQute.bnd.util-6.2.0.pom
@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>biz.aQute.bnd</groupId>
+  <artifactId>biz.aQute.bnd.util</artifactId>
+  <version>6.2.0</version>
+  <description>Util classes</description>
+  <name>biz.aQute.bnd.util</name>
+  <url>https://bnd.bndtools.org/</url>
+  <organization>
+    <name>Bndtools</name>
+    <url>https://bndtools.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>(Apache-2.0 OR EPL-2.0)</name>
+      <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url>
+      <distribution>repo</distribution>
+      <comments>This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0.</comments>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/bndtools/bnd</url>
+    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
+    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
+    <tag>6.2.0</tag>
+  </scm>
+  <developers>
+    <developer>
+      <id>pkriens</id>
+      <email>Peter.Kriens@aQute.biz</email>
+      <name>Peter Kriens</name>
+      <organization>Bndtools</organization>
+      <organizationUrl>https://github.com/bndtools</organizationUrl>
+      <roles>
+        <role>architect</role>
+        <role>developer</role>
+      </roles>
+      <timezone>1</timezone>
+    </developer>
+    <developer>
+      <id>bjhargrave</id>
+      <name>BJ Hargrave</name>
+      <email>bj@hargrave.dev</email>
+      <url>https://github.com/bjhargrave</url>
+      <organization>IBM</organization>
+      <organizationUrl>https://developer.ibm.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+    <developer>
+      <id>rotty3000</id>
+      <name>Ray Augé</name>
+      <email>raymond.auge@liferay.com</email>
+      <url>https://rotty3000.github.io</url>
+      <organization>Liferay Inc.</organization>
+      <organizationUrl>https://www.liferay.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.annotation</artifactId>
+      <version>8.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
--- a/SOURCES/biz.aQute.bndlib-6.2.0.pom
+++ b/SOURCES/biz.aQute.bndlib-6.2.0.pom
@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>biz.aQute.bnd</groupId>
  <artifactId>biz.aQute.bndlib</artifactId>
-  <version>5.2.0</version>
+  <version>6.2.0</version>
  <description>bndlib: A Swiss Army Knife for OSGi</description>
  <name>biz.aQute.bndlib</name>
  <url>https://bnd.bndtools.org/</url>
@ -23,7 +23,7 @@
    <url>https://github.com/bndtools/bnd</url>
    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>5.2.0.REL</tag>
+    <tag>6.2.0</tag>
  </scm>
  <developers>
    <developer>
@ -41,7 +41,7 @@
    <developer>
      <id>bjhargrave</id>
      <name>BJ Hargrave</name>
-      <email>bj@bjhargrave.com</email>
+      <email>bj@hargrave.dev</email>
      <url>https://github.com/bjhargrave</url>
      <organization>IBM</organization>
      <organizationUrl>https://developer.ibm.com</organizationUrl>
@ -67,14 +67,32 @@
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
+      <version>8.1.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>org.osgi</groupId>
-      <artifactId>osgi.core</artifactId>
-      <version>6.0.0</version>
-      <scope>provided</scope>
+      <artifactId>org.osgi.dto</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.resource</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.framework</artifactId>
+      <version>1.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.tracker</artifactId>
+      <version>1.5.4</version>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.osgi</groupId>
@ -104,25 +122,31 @@
      <groupId>org.osgi</groupId>
      <artifactId>org.osgi.service.log</artifactId>
      <version>1.3.0</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>org.osgi.service.repository</artifactId>
      <version>1.1.0</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>org.osgi.util.function</artifactId>
-      <version>1.1.0</version>
-      <scope>provided</scope>
+      <version>1.2.0</version>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>org.osgi.util.promise</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
+      <version>1.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bnd.util</artifactId>
+      <version>6.2.0</version>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
--- a/SOURCES/generate-tarball.sh
+++ b/SOURCES/generate-tarball.sh
@ -5,16 +5,17 @@ name=aqute-bnd
 version="$(sed -n 's/Version:\s*//p' *.spec)"

 # RETRIEVE
-wget "https://github.com/bndtools/bnd/archive/${version}.REL.tar.gz" -O "${name}-${version}.orig.tar.gz"
+wget "https://github.com/bndtools/bnd/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"

 rm -rf tarball-tmp
 mkdir tarball-tmp
 pushd tarball-tmp
 tar -xf "../${name}-${version}.orig.tar.gz"
-mv "bnd-${version}.REL" "${name}-${version}"
+mv "bnd-${version}" "${name}-${version}"

 # CLEAN TARBALL
 rm -rf "${name}-${version}/docs"
+rm -rf '.github'
 find -name '*.jar' -delete
 find -name '*.class' -delete
 find -name '*.ar' -delete
--- a/SOURCES/parent.pom
+++ b/SOURCES/parent.pom
@ -168,6 +168,9 @@
        <module>biz.aQute.bndlib</module>
        <module>biz.aQute.bnd</module>
        <module>biz.aQute.bnd.annotation</module>
+        <module>biz.aQute.bnd.ant</module>
+        <module>biz.aQute.bnd.util</module>
+        <module>maven</module>
    </modules>

    <build>
--- a/SPECS/aqute-bnd.spec
+++ b/SPECS/aqute-bnd.spec
@ -1,13 +1,20 @@
 %bcond_with bootstrap

+%if %{without bootstrap} && !0%{?rhel}
+%bcond_without bnd_maven_plugin
+%else
+%bcond_with bnd_maven_plugin
+%endif
+
 Name:           aqute-bnd
-Version:        5.2.0
-Release:        7%{?dist}
+Version:        6.2.0
+Release:        4%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0 or EPL-2.0
 URL:            https://bnd.bndtools.org/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

 Source0:        %{name}-%{version}.tar.gz
 # removes bundled jars from upstream tarball
@ -20,25 +27,41 @@ Source3:        https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{versio
 Source4:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom
 Source5:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom
 Source6:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom
+Source7:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom
+Source8:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/%{version}/biz.aQute.bnd.util-%{version}.pom

 Patch1:         0001-Disable-removed-commands.patch
 Patch2:         0002-Port-to-OSGI-7.0.0.patch

-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires:  mvn(org.junit:junit-bom:pom:)
 BuildRequires:  mvn(org.osgi:osgi.annotation)
 BuildRequires:  mvn(org.osgi:osgi.cmpn)
 BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
 %endif
+%if %{with bnd_maven_plugin}
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.apache.maven.shared:maven-mapping)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.eclipse.aether:aether-api)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
+%endif

 # Explicit javapackages-tools requires since bnd script uses
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
-Requires:       java-devel

 %description
 The bnd tool helps you create and diagnose OSGi bundles.
@ -59,6 +82,14 @@ Summary:        BND library
 %description -n aqute-bndlib
 %{summary}.

+%if %{with bnd_maven_plugin}
+%package -n bnd-maven-plugin
+Summary:        BND Maven plugin
+
+%description -n bnd-maven-plugin
+%{summary}.
+%endif
+
 %package javadoc
 Summary:        Javadoc for %{name}

@ -77,6 +108,10 @@ rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteComman
 sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml
 sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info

+%if %{without bnd_maven_plugin}
+%pom_disable_module maven
+%endif
+
 # libg
 pushd aQute.libg
 cp -p %{SOURCE3} pom.xml
@ -101,21 +136,37 @@ cp -p %{SOURCE5} pom.xml
 %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
 popd

+# bnd.ant
+pushd biz.aQute.bnd.ant
+cp -p %{SOURCE7} pom.xml
+%pom_add_parent biz.aQute.bnd:parent:%{version}
+popd
+
 # bnd
 cp -r biz.aQute.bnd.exporters/src/aQute/bnd/exporter biz.aQute.bnd/src/aQute/bnd/
 pushd biz.aQute.bnd
 cp -p %{SOURCE4} pom.xml
 %pom_add_parent biz.aQute.bnd:parent:%{version}
 %pom_remove_dep :biz.aQute.resolve
-%pom_remove_dep :biz.aQute.bnd.ant
 %pom_remove_dep :biz.aQute.repository
 %pom_remove_dep :biz.aQute.bnd.exporters
 %pom_remove_dep :biz.aQute.bnd.reporter
 %pom_remove_dep :biz.aQute.remote.api
 %pom_remove_dep :snakeyaml
 %pom_remove_dep :jline
+%pom_remove_dep org.osgi:org.osgi.service.coordinator
+%pom_remove_dep org.osgi:org.osgi.service.resolver
+popd
+
+# bnd.util
+pushd biz.aQute.bnd.util
+cp -p %{SOURCE8} pom.xml
+%pom_add_parent biz.aQute.bnd:parent:%{version}
+%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
 popd

+%pom_remove_dep -r org.osgi:org.osgi.dto
+%pom_remove_dep -r org.osgi:org.osgi.framework
 %pom_remove_dep -r org.osgi:org.osgi.namespace.contract
 %pom_remove_dep -r org.osgi:org.osgi.namespace.extender
 %pom_remove_dep -r org.osgi:org.osgi.namespace.implementation
@ -126,9 +177,30 @@ popd
 %pom_remove_dep -r org.osgi:org.osgi.service.serviceloader
 %pom_remove_dep -r org.osgi:org.osgi.util.function
 %pom_remove_dep -r org.osgi:org.osgi.util.promise
+%pom_remove_dep -r org.osgi:org.osgi.util.tracker

 %pom_xpath_remove -r pom:project/pom:dependencies/pom:dependency/pom:scope

+# maven-plugins
+cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
+cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/executions maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
+pushd maven
+%pom_remove_dep -r :biz.aQute.bnd.maven
+# Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli
+%pom_disable_module bnd-indexer-maven-plugin
+# Requires unbuilt parts of bnd
+%pom_disable_module bnd-export-maven-plugin
+%pom_disable_module bnd-reporter-maven-plugin
+%pom_disable_module bnd-resolver-maven-plugin
+%pom_disable_module bnd-run-maven-plugin
+%pom_disable_module bnd-testing-maven-plugin
+# Integration tests require Internet access
+%pom_remove_plugin -r :maven-invoker-plugin
+%pom_remove_plugin -r :maven-javadoc-plugin
+
+%pom_remove_plugin -r :flatten-maven-plugin
+popd
+
 %mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
 %mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib

@ -137,6 +209,10 @@ popd
 %mvn_package biz.aQute.bnd:aQute.libg bndlib
 %mvn_package biz.aQute.bnd:parent __noinstall
 %mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall
+%if %{with bnd_maven_plugin}
+%mvn_package biz.aQute.bnd:bnd-maven-plugin maven
+%mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven
+%endif

 %build
 %mvn_build -- -Dproject.build.sourceEncoding=UTF-8
@ -157,14 +233,42 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %files -n aqute-bndlib -f .mfiles-bndlib
 %license LICENSE

+%if %{with bnd_maven_plugin}
+%files -n bnd-maven-plugin -f .mfiles-maven
+%endif
+
 %files javadoc -f .mfiles-javadoc
 %license LICENSE

 %changelog
-* Mon Dec 20 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-7
- Add requires on java-devel
+* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 6.2.0-4
+- Rebuild to regenerate auto-requires
+
+* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-3
+- Rebuild to regenerate auto-requires
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Fri Dec 17 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 5.2.0-6
+* Tue May 03 2022 Marian Koncek <mkoncek@redhat.com> - 6.2.0-1
+- Update to upstream version 6.2.0
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 5.2.0-9
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 22 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 5.2.0-7
+- Enable biz.aQute.bnd.ant
+
+* Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-6
+- Rename maven_plugin build conditional to bnd_maven_plugin
+
+* Tue Aug 10 2021 Sérgio Basto <sergio@serjux.com> - 5.2.0-5
+- reenable bnd-maven-plugin
+
+* Mon Aug 02 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 5.2.0-4
 - Add parent to biz.aQute.bnd/pom.xml (fixes [WARNING] JAR will be
  empty - no content was marked for inclusion!)
 - Remove scope from dependencies in pom.xml files (fixes missing
@ -172,17 +276,10 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
  the rpm dependency generator)
 - Drop some more commands: shell, exportreport, mbr (uses parts that
  are not packaged)
- Resolves: rhbz#2033709
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-4
- Rebuild to workaround DistroBaker issue
+- Resolves: rhbz#1985566

-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-3
- Bootstrap Maven for CentOS Stream 9
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-2
 - Bootstrap build