.aqute-bnd.metadata

@@ -1 +0,0 @@
-86b993498bffd8f33d112c644cf9c9061070c318 SOURCES/4.3.0.REL.tar.gz

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,46 @@
-SOURCES/4.3.0.REL.tar.gz
+/results_*
+/*.src.rpm
+/*.noarch.rpm
+/2.4.1.REL.tar.gz
+/3.2.0.REL.tar.gz
+/3.3.0.REL.tar.gz
+/3.4.0.REL.tar.gz
+/3.5.0.REL.tar.gz
+/4.3.0.REL.tar.gz
+/4.3.1.REL.tar.gz
+/*.pom
+/aQute.libg-3.5.0.pom
+/biz.aQute.bnd-3.5.0.pom
+/biz.aQute.bndlib-3.5.0.pom
+/biz.aQute.bnd.annotation-3.5.0.pom
+/4.2.0.REL.tar.gz
+/aQute.libg-4.2.0.pom
+/biz.aQute.bnd-4.2.0.pom
+/biz.aQute.bndlib-4.2.0.pom
+/biz.aQute.bnd.annotation-4.2.0.pom
+/4.3.0.REL.tar.gz
+/aQute.libg-4.3.0.pom
+/biz.aQute.bnd-4.3.0.pom
+/biz.aQute.bndlib-4.3.0.pom
+/biz.aQute.bnd.annotation-4.3.0.pom
+/5.0.0.REL.tar.gz
+/aQute.libg-5.0.0.pom
+/biz.aQute.bnd-5.0.0.pom
+/biz.aQute.bnd.annotation-5.0.0.pom
+/biz.aQute.bndlib-5.0.0.pom
+/aqute-bnd-5.1.1.tar.gz
+/aQute.libg-5.1.1.pom
+/biz.aQute.bnd-5.1.1.pom
+/biz.aQute.bnd.annotation-5.1.1.pom
+/biz.aQute.bndlib-5.1.1.pom
+/aqute-bnd-5.1.2.tar.gz
+/aQute.libg-5.1.2.pom
+/biz.aQute.bnd-5.1.2.pom
+/biz.aQute.bnd.annotation-5.1.2.pom
+/biz.aQute.bndlib-5.1.2.pom
+/aqute-bnd-5.2.0.tar.gz
+/aQute.libg-5.2.0.pom
+/biz.aQute.bnd-5.2.0.pom
+/biz.aQute.bnd.annotation-5.2.0.pom
+/biz.aQute.bndlib-5.2.0.pom
+/aqute-bnd-6.2.0.tar.gz

0001-Disable-removed-commands.patch

@@ -1,25 +1,16 @@
-From c250eb3ebbb9afb650edc080708c5e4c3cccbb78 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Tue, 4 Oct 2016 18:02:26 +0200
-Subject: [PATCH 1/2] Disable removed commands
-
----
- biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 48 -----------------------
- 1 file changed, 48 deletions(-)
-
 diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-index 3f21168..d6c9ccd 100644
+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.Processor;
+@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Resource;
- 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;
+@@ -3921,54 +3920,6 @@ public class bnd extends Processor {
-@@ -4213,53 +4212,6 @@ public class bnd extends Processor {
  		getInfo(profiles);
  	}
  
@@ -70,9 +61,48 @@ index 3f21168..d6c9ccd 100644
 -		getInfo(rc);
 -		rc.close();
 -	}
- 
+-
  	/**
  	 * Export a bndrun file
--- 
+ 	 */
-2.21.0
+@@ -4424,15 +4375,6 @@ public class bnd extends Processor {
+ 		}
+ 	}
  
+-	@Description("Start an interactive shell")
+-	public void _shell(Shell.ShellOptions options) throws Exception {
+-		try (Shell shell = new Shell(this, options)) {
+-			shell.loop();
+-		} finally {
+-			out.println("done");
+-		}
+-	}
+-
+ 	public Workspace getWorkspace() {
+ 		return workspace;
+ 	}
+@@ -4479,24 +4421,6 @@ public class bnd extends Processor {
+ 
+ 	}
+ 
+-	@Description("Generate and export reports of a workspace, a project or of a jar.")
+-	public void _exportreport(ExportReportCommand.ReporterOptions options) throws Exception {
+-		ExportReportCommand mc = new ExportReportCommand(this);
+-		mc.run(options);
+-		getInfo(mc);
+-	}
+-
+-	@Description("Maintain Maven Bnd Repository GAV files")
+-	public void _mbr(MbrCommand.MrOptions options) throws Exception {
+-		MbrCommand c = new MbrCommand(this, options);
+-		CommandLine cl = new CommandLine(this);
+-		String s = cl.subCmd(options, c);
+-		if (s != null) {
+-			out.println(s);
+-		}
+-		getInfo(c);
+-	}
+-
+ 	@Description("Shows the differences between two XML resource repositories")
+ 	public void _xmlrepodiff(XmlRepoDiffOptions options) throws Exception {
+ 		try (XmlRepoDiffCommand cmd = new XmlRepoDiffCommand(this)) {

SOURCES/0002-Fix-ant-compatibility.patch

@@ -1,25 +0,0 @@
-From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Tue, 12 Sep 2017 18:11:27 +0300
-Subject: [PATCH 2/2] Fix ant compatibility
-
----
- biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-index dd438a5..6b714be 100644
---- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-@@ -220,7 +220,7 @@ public class BndTask extends BaseTask {
- 				if (inherit) {
- 					Properties projectProperties = new UTF8Properties();
- 					@SuppressWarnings("unchecked")
--					Hashtable<Object, Object> antProps = getProject().getProperties();
-+					Hashtable<String,Object> antProps = getProject().getProperties();
- 					projectProperties.putAll(antProps);
- 					projectProperties.putAll(builder.getProperties());
- 					builder.setProperties(projectProperties);
--- 
-2.20.1
-

SOURCES/aQute.libg-4.3.0.pom

@@ -1,74 +0,0 @@
-<?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>aQute.libg</artifactId>
-  <version>4.3.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>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 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>4.3.0.REL</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>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.function</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.promise</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

SOURCES/biz.aQute.bnd-4.3.0.pom

@@ -1,110 +0,0 @@
-<?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</artifactId>
-  <version>4.3.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>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 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>4.3.0.REL</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>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bndlib</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.resolve</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.repository</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bnd.exporters</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bnd.reporter</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.remote.api</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>1.15</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.7.25</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
-      <version>2.14.6</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>

SOURCES/biz.aQute.bnd.annotation-4.3.0.pom

@@ -1,56 +0,0 @@
-<?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.annotation</artifactId>
-  <version>4.3.0</version>
-  <description>bnd Annotations Library</description>
-  <name>biz.aQute.bnd.annotation</name>
-  <url>https://bnd.bndtools.org/</url>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 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>4.3.0.REL</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>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

SOURCES/biz.aQute.bndlib-4.3.0.pom

@@ -1,70 +0,0 @@
-<?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.bndlib</artifactId>
-  <version>4.3.0</version>
-  <description>bndlib: A Swiss Army Knife for OSGi</description>
-  <name>biz.aQute.bndlib</name>
-  <url>https://bnd.bndtools.org/</url>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 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>4.3.0.REL</tag>
-  </scm>
-  <developers>
-    <developer>
-      <id>peter.kriens@aQute.biz</id>
-      <email>peter.kriens@aQute.biz</email>
-    </developer>
-    <developer>
-      <id>njbartlett@gmail.com</id>
-      <email>njbartlett@gmail.com</email>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.function</artifactId>
-      <version>1.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.promise</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

SOURCES/repack-tarball.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=`sed -rn 's/^Version:\s*([0-9.]+)/\1/p' aqute-bnd.spec`
-wget https://github.com/bndtools/bnd/archive/$VERSION.REL.tar.gz
-gunzip $VERSION.REL.tar.gz
-tar tf $VERSION.REL.tar | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs tar --delete --file $VERSION.REL.tar
-gzip $VERSION.REL.tar

aqute-bnd.spec

@@ -1,29 +1,52 @@
+%bcond_with bootstrap
+
+%if %{without bootstrap} && !0%{?rhel}
+%bcond_without bnd_maven_plugin
+%else
+%bcond_with bnd_maven_plugin
+%endif
+
 Name:           aqute-bnd
-Version:        4.3.0
+Version:        6.2.0
 Release:        2%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
-License:        ASL 2.0
+License:        ASL 2.0 or EPL-2.0
-URL:            http://bnd.bndtools.org/
+URL:            https://bnd.bndtools.org/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Source0:        %{version}.REL.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 # removes bundled jars from upstream tarball
 # run as:
-# ./repack-tarball.sh
+# ./generate-tarball.sh
-Source1:        repack-tarball.sh
+Source1:        generate-tarball.sh
 
 Source2:        parent.pom
 Source3:        https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
 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
 
-Patch0:         0001-Disable-removed-commands.patch
+Patch1:         0001-Disable-removed-commands.patch
-Patch1:         0002-Fix-ant-compatibility.patch
+Patch2:         0002-Port-to-OSGI-7.0.0.patch
-Patch2:         0003-Port-to-OSGI-7.0.0.patch
 
+%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)
@@ -33,12 +56,8 @@ 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.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)
 BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
+%endif
 
 # Explicit javapackages-tools requires since bnd script uses
 # /usr/share/java-utils/java-functions
@@ -63,11 +82,13 @@ 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}
@@ -76,31 +97,29 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n bnd-%{version}.REL
+%setup -q
 
-rm gradlew*
-
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
 # the commands pull in more dependencies than we want (felix-resolver, jetty)
-rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
+rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java
 
 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
 %pom_add_parent biz.aQute.bnd:parent:%{version}
-%pom_remove_dep :org.osgi.util.function
-%pom_remove_dep :org.osgi.util.promise
-%pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
 popd
 
-# bndlib.annotations
+# bnd.annotation
 pushd biz.aQute.bnd.annotation
 cp -p %{SOURCE6} pom.xml
 %pom_add_parent biz.aQute.bnd:parent:%{version}
@@ -112,18 +131,22 @@ popd
 pushd biz.aQute.bndlib
 cp -p %{SOURCE5} pom.xml
 %pom_add_parent biz.aQute.bnd:parent:%{version}
-%pom_remove_dep :org.osgi.util.function
-%pom_remove_dep :org.osgi.util.promise
-%pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
 %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.repository
 %pom_remove_dep :biz.aQute.bnd.exporters
@@ -131,10 +154,36 @@ cp -p %{SOURCE4} pom.xml
 %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
+%pom_remove_dep -r org.osgi:org.osgi.namespace.service
+%pom_remove_dep -r org.osgi:org.osgi.resource
+%pom_remove_dep -r org.osgi:org.osgi.service.log
+%pom_remove_dep -r org.osgi:org.osgi.service.repository
+%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
@@ -158,10 +207,12 @@ popd
 %mvn_package biz.aQute.bnd:biz.aQute.bndlib bndlib
 %mvn_package biz.aQute.bnd:biz.aQute.bnd.annotation bndlib
 %mvn_package biz.aQute.bnd:aQute.libg bndlib
-%mvn_package biz.aQute.bnd:bnd-maven-plugin maven
-%mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven
 %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
@@ -182,27 +233,118 @@ 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
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* 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
+  dependencies, dependencies marked with scope provided are ignored by
+  the rpm dependency generator)
+- Drop some more commands: shell, exportreport, mbr (uses parts that
+  are not packaged)
+- Resolves: rhbz#1985566
+
+* 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
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 5.2.0-1
+- Update to upstream version 5.2.0
+
+* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 4.3.1-3
+- Update jansi path for jansi 1.x and jline path for jline 2.x
+
+* Wed Nov 25 2020 Mat Booth <mat.booth@redhat.com> - 4.3.1-2
+- Add OSGi metadata
+
+* Tue Sep 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.2-1
+- Update to upstream version 5.1.2
+
+* Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 4.3.1-1
+- Update to latest 4.x release
+
+* Mon Jul 27 2020 Mat Booth <mat.booth@redhat.com> - 4.3.0-1
+- Update to upstream version 4.3.0
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Mat Booth <mat.booth@redhat.com> - 3.5.0-10
+- Fix NIO linkage error when running on Java 8 due to incorrect cross-compilation
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.5.0-9
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jun 23 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.1-1
+- Update to upstream version 5.1.1
+
+* Fri Apr 24 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0.0-2
+- Disable bnd-maven-plugin
+
+* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.0.0-1
+- Update to upstream version 5.0.0
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.0-2
 - Mass rebuild for javapackages-tools 201902
 
 * Wed Oct 09 2019 Marian Koncek <mkoncek@redhat.com> - 4.3.0-1
 - Update to upstream version 4.3.0
 
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Jul 04 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
 - Update to upstream version 4.2.0
 
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.0-6
 - Mass rebuild for javapackages-tools 201901
 
+* Fri Apr 12 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-6
+- Port to OSGI 7.0.0
+
 * Fri Apr 12 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-5
 - Port to OSGI 7.0.0
 
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 3.5.0-4
 - Add requirement on javapackages-tools for bnd script.
 

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,9 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

generate-tarball.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+
+name=aqute-bnd
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+# RETRIEVE
+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}" "${name}-${version}"
+
+# CLEAN TARBALL
+rm -rf "${name}-${version}/docs"
+rm -rf '.github'
+find -name '*.jar' -delete
+find -name '*.class' -delete
+find -name '*.ar' -delete
+find -name '*.tar' -delete
+find -name '*.gz' -delete
+find -name '*.bz2' -delete
+find -name '*.xz' -delete
+find -name '*.zip' -delete
+find -name '*.exe' -delete
+find -name '*.dll' -delete
+
+tar -czf "../${name}-${version}.tar.gz" *
+popd
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

parent.pom

@@ -168,6 +168,8 @@
         <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>
 

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary:
+    Run javapackages-specific tests
+discover:
+    how: fmf
+    url: https://pagure.io/javapackages-validator-tests
+execute:
+    how: tmt

plans/smoke.fmf

@@ -0,0 +1,10 @@
+summary: Basic smoke test
+prepare:
+  how: install
+  package: unzip
+execute:
+  script: |
+    bnd wrap -b foo -v 1.2.3 /usr/share/java/ant/ant-bootstrap.jar
+    unzip ant-bootstrap.jar META-INF/MANIFEST.MF
+    grep ^Bundle-SymbolicName:.foo META-INF/MANIFEST.MF
+    grep ^Bundle-Version:.1.2.3 META-INF/MANIFEST.MF

sources

@@ -0,0 +1,7 @@
+SHA512 (aqute-bnd-6.2.0.tar.gz) = 4d475b98c51e538ea5dfc362012b98d3f0207cf954b5046bb2072455831a92ee98e7fd27f990ac9ff3eb0f7d9cd2e2227a830a9afc4cb19e409a96a5f56ad2af
+SHA512 (aQute.libg-6.2.0.pom) = d7237813eba88e3497e19b3672f7371fcf0f80c80999b0339b173273e7e84a03438b83700b399deaf0422d3cb3ab447e0a2fef38a44224967ab9263f90faf782
+SHA512 (biz.aQute.bnd-6.2.0.pom) = e17460422144a86741401e8c1eb238590271f4f6141f03b73c904098336b36830c8003e2abea1fc025f04006ff82866581f66951e1a0d271835dc423fe655721
+SHA512 (biz.aQute.bnd.annotation-6.2.0.pom) = 8fa670018b656f020987b1f0187b13313dcda7f35310a1a7419d0a1737a3de37d74b50560ee138bf4412cad4cd1fd97557d61f5625df811c5621c6b631050e82
+SHA512 (biz.aQute.bnd.ant-6.2.0.pom) = 54926d8dfd4977ab105b4f0cc077a88ecda8aa46ab3f8b26198947600075bcff51719f1f03f2980a546140694a8bd5c9c9aa2eb203f1453d62c2f02cc3a32d98
+SHA512 (biz.aQute.bnd.util-6.2.0.pom) = 5fcdf1f863565187dc55ed821893a0cdb05fc061ff0eccecdd717ea28ee20804bf7640f48ac057a326d5924101bb0f149c9a3673deb396feca626f81b5656a80
+SHA512 (biz.aQute.bndlib-6.2.0.pom) = 06d2863c7bec5b420d1660122cf33b9ca5d6e25683e3e6bd25ea579155ece3c3d309b183588918dc8541169813d8a59155036c0a3d177dd19e35fb4fde4ffaa8