From cb227bdb5118dbfe57b68fa05d1418806c9a67d5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 29 Nov 2018 12:42:46 +0000
Subject: [PATCH 01/14] Expand conditionals

---
 aqute-bnd.spec | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 659b24a..f3c27f9 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,5 +1,3 @@
-%bcond_without ant_tasks
-%bcond_without maven_plugin
 
 Name:           aqute-bnd
 Version:        3.5.0
@@ -31,10 +29,7 @@ BuildRequires:  mvn(org.osgi:osgi.cmpn)
 BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
-%if %{with ant_tasks}
 BuildRequires:  mvn(org.apache.ant:ant)
-%endif
-%if %{with maven_plugin}
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
@@ -45,7 +40,6 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 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
@@ -69,13 +63,11 @@ Summary:        BND library
 %description -n aqute-bndlib
 %{summary}.
 
-%if %{with maven_plugin}
 %package -n bnd-maven-plugin
 Summary:        BND Maven plugin
 
 %description -n bnd-maven-plugin
 %{summary}.
-%endif
 
 %package javadoc
 Summary:        Javadoc for %{name}
@@ -97,13 +89,7 @@ rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.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 ant_tasks}
-rm -rf biz.aQute.bnd/src/aQute/bnd/ant
-%endif
 
-%if %{without maven_plugin}
-%pom_disable_module maven
-%endif
 
 # libg
 pushd aQute.libg
@@ -140,9 +126,7 @@ cp -p %{SOURCE4} pom.xml
 %pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version}
 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
 %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
-%if %{with ant_tasks}
 %pom_add_dep org.apache.ant:ant
-%endif
 %pom_add_dep org.osgi:osgi.annotation
 %pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
@@ -188,26 +172,20 @@ popd
 %install
 %mvn_install
 
-%if %{with ant_tasks}
 install -d -m 755 %{buildroot}%{_sysconfdir}/ant.d
 echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium" >%{buildroot}%{_sysconfdir}/ant.d/%{name}
-%endif
 
 %jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:osgi-annotation:osgi-core:osgi-compendium bnd 1
 
 %files -f .mfiles
 %license LICENSE
 %{_bindir}/bnd
-%if %{with ant_tasks}
 %config(noreplace) %{_sysconfdir}/ant.d/*
-%endif
 
 %files -n aqute-bndlib -f .mfiles-bndlib
 %license LICENSE
 
-%if %{with maven_plugin}
 %files -n bnd-maven-plugin -f .mfiles-maven
-%endif
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE

From 9dc6e1b86c97c3a8c4fb6621b75989195da6c65d Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 12 Apr 2019 15:43:50 +0200
Subject: [PATCH 02/14] Port to OSGI 7.0.0

---
 0001-Port-to-OSGI-7.0.0.patch | 117 ++++++++++++++++++++++++++++++++++
 aqute-bnd.spec                |   7 +-
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 0001-Port-to-OSGI-7.0.0.patch

diff --git a/0001-Port-to-OSGI-7.0.0.patch b/0001-Port-to-OSGI-7.0.0.patch
new file mode 100644
index 0000000..b51897c
--- /dev/null
+++ b/0001-Port-to-OSGI-7.0.0.patch
@@ -0,0 +1,117 @@
+From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Fri, 12 Apr 2019 14:59:30 +0200
+Subject: [PATCH] Port to OSGI 7.0.0
+
+---
+ .../src/aQute/bnd/main/ReporterLogger.java    | 16 +++++++++
+ .../src/aQute/bnd/testing/TestingLog.java     | 35 +++++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+diff --git a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
+index ce86cd6..735db9c 100644
+--- a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
++++ b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
+@@ -1,5 +1,6 @@
+ package aQute.bnd.main;
+ 
++import org.osgi.framework.Bundle;
+ import org.osgi.framework.ServiceReference;
+ import org.osgi.service.log.LogService;
+ import org.slf4j.Logger;
+@@ -8,6 +9,7 @@ import org.slf4j.LoggerFactory;
+ import aQute.service.reporter.Reporter;
+ 
+ public class ReporterLogger implements LogService {
++	private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility");
+ 	private final static Logger	logger	= LoggerFactory.getLogger(ReporterLogger.class);
+ 
+ 	private Reporter	reporter;
+@@ -108,4 +110,18 @@ public class ReporterLogger implements LogService {
+ 		}
+ 	}
+ 
++	@Override
++	public org.osgi.service.log.Logger getLogger(String name) {throw UNSUPPORTED;}
++
++	@Override
++	public org.osgi.service.log.Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;}
++
++	@Override
++	public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;}
++
++	@Override
++	public <L extends org.osgi.service.log.Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;}
++
++	@Override
++	public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;}
+ }
+diff --git a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
+index d9c3e78..ec7dd27 100644
+--- a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
++++ b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
+@@ -8,7 +8,9 @@ import java.util.regex.Pattern;
+ 
+ import org.osgi.framework.Bundle;
+ import org.osgi.framework.ServiceReference;
++import org.osgi.service.log.Logger;
+ import org.osgi.service.log.LogEntry;
++import org.osgi.service.log.LogLevel;
+ import org.osgi.service.log.LogService;
+ 
+ import aQute.bnd.annotation.component.Activate;
+@@ -26,6 +28,8 @@ import aQute.bnd.testing.TestingLog.Config;
+ @Component(designate = Config.class)
+ @SuppressWarnings("rawtypes")
+ public class TestingLog implements LogService {
++	private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility");
++
+ 	boolean			stacktrace;
+ 	boolean			direct;
+ 	int				level;
+@@ -125,6 +129,22 @@ public class TestingLog implements LogService {
+ 					return sb.toString();
+ 				}
+ 			}
++
++			@Override
++			public LogLevel getLogLevel() {throw UNSUPPORTED;}
++
++			@Override
++			public String getLoggerName() {throw UNSUPPORTED;}
++
++			@Override
++			public long getSequence() {throw UNSUPPORTED;}
++
++			@Override
++			public String getThreadInfo() {throw UNSUPPORTED;}
++
++			@Override
++			public StackTraceElement getLocation() {throw UNSUPPORTED;}
++
+ 		};
+ 		entries.add(entry);
+ 		if (direct)
+@@ -197,4 +217,19 @@ public class TestingLog implements LogService {
+ 		return n != 0;
+ 	}
+ 
++	@Override
++	public Logger getLogger(String name) {throw UNSUPPORTED;}
++
++	@Override
++	public Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;}
++
++	@Override
++	public <L extends Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;}
++
++	@Override
++	public <L extends Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;}
++
++	@Override
++	public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;}
++
+ }
+-- 
+2.20.1
+
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index f3c27f9..5d8be46 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,7 +1,7 @@
 
 Name:           aqute-bnd
 Version:        3.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0
@@ -22,6 +22,7 @@ Source6:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annot
 
 Patch0:         0001-Disable-removed-commands.patch
 Patch1:         0002-Fix-ant-compatibility.patch
+Patch2:         0001-Port-to-OSGI-7.0.0.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.osgi:osgi.annotation)
@@ -82,6 +83,7 @@ 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
@@ -191,6 +193,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* Fri Apr 12 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-5
+- Port to OSGI 7.0.0
+
 * Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 3.5.0-4
 - Add requirement on javapackages-tools for bnd script.
 

From c4933bb857d20cffe291ddd10e549b9150d41742 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 24 May 2019 17:00:23 +0200
Subject: [PATCH 03/14] Mass rebuild for javapackages-tools 201901

---
 aqute-bnd.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 5d8be46..fa4535a 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,7 +1,7 @@
 
 Name:           aqute-bnd
 Version:        3.5.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0
@@ -193,6 +193,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* 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-5
 - Port to OSGI 7.0.0
 

From ab34148b38186b76fc9949c3e6da6b15fdf5cc2e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 22 Jul 2019 09:47:05 +0200
Subject: [PATCH 04/14] Update to upstream version 4.2.0

---
 .gitignore                          |   5 ++
 0001-Disable-removed-commands.patch |  28 ++++---
 0001-Port-to-OSGI-7.0.0.patch       | 117 ----------------------------
 0002-Fix-ant-compatibility.patch    |   4 +-
 0003-Port-to-OSGI-7.0.0.patch       | 102 ++++++++++++++++++++++++
 aqute-bnd.spec                      |  60 +++++++-------
 parent.pom                          |   6 +-
 sources                             |  10 +--
 8 files changed, 163 insertions(+), 169 deletions(-)
 delete mode 100644 0001-Port-to-OSGI-7.0.0.patch
 create mode 100644 0003-Port-to-OSGI-7.0.0.patch

diff --git a/.gitignore b/.gitignore
index b21555c..a63b4ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,8 @@
 /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
diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch
index 1a6ed57..4f818fa 100644
--- a/0001-Disable-removed-commands.patch
+++ b/0001-Disable-removed-commands.patch
@@ -4,14 +4,14 @@ 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 | 45 -------------------------------
- 1 file changed, 45 deletions(-)
+ biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 49 -----------------------
+ 1 file changed, 49 deletions(-)
 
 diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-index 1cc3216..c669e4a 100644
+index 0e6f055..166687b 100644
 --- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
 +++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-@@ -105,7 +105,6 @@ import aQute.bnd.osgi.Processor;
+@@ -108,7 +108,6 @@ import aQute.bnd.osgi.Processor;
  import aQute.bnd.osgi.Resource;
  import aQute.bnd.osgi.Verifier;
  import aQute.bnd.osgi.eclipse.EclipseClasspath;
@@ -19,10 +19,11 @@ index 1cc3216..c669e4a 100644
  import aQute.bnd.service.Actionable;
  import aQute.bnd.service.RepositoryPlugin;
  import aQute.bnd.service.action.Action;
-@@ -4064,50 +4063,6 @@ public class bnd extends Processor {
+@@ -4225,54 +4224,6 @@ public class bnd extends Processor {
+ 		getInfo(profiles);
  	}
  
- 	/**
+-	/**
 -	 * Resolve command
 -	 * 
 -	 * @throws Exception
@@ -30,7 +31,8 @@ index 1cc3216..c669e4a 100644
 -
 -	public void _resolve(ResolveCommand.ResolveOptions options) throws Exception {
 -		ResolveCommand rc = new ResolveCommand(this);
--		String help = options._command().subCmd(options, rc);
+-		String help = options._command()
+-			.subCmd(options, rc);
 -		if (help != null)
 -			out.println(help);
 -		getInfo(rc);
@@ -45,7 +47,8 @@ index 1cc3216..c669e4a 100644
 -
 -	public void _remote(RemoteCommand.RemoteOptions options) throws Exception {
 -		RemoteCommand rc = new RemoteCommand(this, options);
--		String help = options._command().subCmd(options, rc);
+-		String help = options._command()
+-			.subCmd(options, rc);
 -		if (help != null)
 -			out.println(help);
 -		getInfo(rc);
@@ -60,16 +63,17 @@ index 1cc3216..c669e4a 100644
 -
 -	public void _nexus(NexusCommand.NexusOptions options) throws Exception {
 -		NexusCommand rc = new NexusCommand(this, options);
--		String help = options._command().subCmd(options, rc);
+-		String help = options._command()
+-			.subCmd(options, rc);
 -		if (help != null)
 -			out.println(help);
 -		getInfo(rc);
 -		rc.close();
 -	}
--	/**
+-
+ 	/**
  	 * Export a bndrun file
  	 */
- 
 -- 
-2.13.5
+2.20.1
 
diff --git a/0001-Port-to-OSGI-7.0.0.patch b/0001-Port-to-OSGI-7.0.0.patch
deleted file mode 100644
index b51897c..0000000
--- a/0001-Port-to-OSGI-7.0.0.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Fri, 12 Apr 2019 14:59:30 +0200
-Subject: [PATCH] Port to OSGI 7.0.0
-
----
- .../src/aQute/bnd/main/ReporterLogger.java    | 16 +++++++++
- .../src/aQute/bnd/testing/TestingLog.java     | 35 +++++++++++++++++++
- 2 files changed, 51 insertions(+)
-
-diff --git a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
-index ce86cd6..735db9c 100644
---- a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
-+++ b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java
-@@ -1,5 +1,6 @@
- package aQute.bnd.main;
- 
-+import org.osgi.framework.Bundle;
- import org.osgi.framework.ServiceReference;
- import org.osgi.service.log.LogService;
- import org.slf4j.Logger;
-@@ -8,6 +9,7 @@ import org.slf4j.LoggerFactory;
- import aQute.service.reporter.Reporter;
- 
- public class ReporterLogger implements LogService {
-+	private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility");
- 	private final static Logger	logger	= LoggerFactory.getLogger(ReporterLogger.class);
- 
- 	private Reporter	reporter;
-@@ -108,4 +110,18 @@ public class ReporterLogger implements LogService {
- 		}
- 	}
- 
-+	@Override
-+	public org.osgi.service.log.Logger getLogger(String name) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public org.osgi.service.log.Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public <L extends org.osgi.service.log.Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;}
- }
-diff --git a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
-index d9c3e78..ec7dd27 100644
---- a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java
-@@ -8,7 +8,9 @@ import java.util.regex.Pattern;
- 
- import org.osgi.framework.Bundle;
- import org.osgi.framework.ServiceReference;
-+import org.osgi.service.log.Logger;
- import org.osgi.service.log.LogEntry;
-+import org.osgi.service.log.LogLevel;
- import org.osgi.service.log.LogService;
- 
- import aQute.bnd.annotation.component.Activate;
-@@ -26,6 +28,8 @@ import aQute.bnd.testing.TestingLog.Config;
- @Component(designate = Config.class)
- @SuppressWarnings("rawtypes")
- public class TestingLog implements LogService {
-+	private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility");
-+
- 	boolean			stacktrace;
- 	boolean			direct;
- 	int				level;
-@@ -125,6 +129,22 @@ public class TestingLog implements LogService {
- 					return sb.toString();
- 				}
- 			}
-+
-+			@Override
-+			public LogLevel getLogLevel() {throw UNSUPPORTED;}
-+
-+			@Override
-+			public String getLoggerName() {throw UNSUPPORTED;}
-+
-+			@Override
-+			public long getSequence() {throw UNSUPPORTED;}
-+
-+			@Override
-+			public String getThreadInfo() {throw UNSUPPORTED;}
-+
-+			@Override
-+			public StackTraceElement getLocation() {throw UNSUPPORTED;}
-+
- 		};
- 		entries.add(entry);
- 		if (direct)
-@@ -197,4 +217,19 @@ public class TestingLog implements LogService {
- 		return n != 0;
- 	}
- 
-+	@Override
-+	public Logger getLogger(String name) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public <L extends Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public <L extends Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;}
-+
-+	@Override
-+	public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;}
-+
- }
--- 
-2.20.1
-
diff --git a/0002-Fix-ant-compatibility.patch b/0002-Fix-ant-compatibility.patch
index 12d2b1e..916012f 100644
--- a/0002-Fix-ant-compatibility.patch
+++ b/0002-Fix-ant-compatibility.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Fix ant compatibility
  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 aac8b8a..26dfe59 100644
+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 {
@@ -21,5 +21,5 @@ index aac8b8a..26dfe59 100644
  					projectProperties.putAll(builder.getProperties());
  					builder.setProperties(projectProperties);
 -- 
-2.13.5
+2.20.1
 
diff --git a/0003-Port-to-OSGI-7.0.0.patch b/0003-Port-to-OSGI-7.0.0.patch
new file mode 100644
index 0000000..c807cd1
--- /dev/null
+++ b/0003-Port-to-OSGI-7.0.0.patch
@@ -0,0 +1,102 @@
+From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 11 Jul 2019 14:29:26 +0200
+Subject: [PATCH] Port to OSGI 7.0.0
+
+---
+ .../src/aQute/bnd/junit/ConsoleLogger.java    | 62 +++++++++++++++++++
+ 1 file changed, 62 insertions(+)
+
+diff --git a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java
+index 9c2591f..569b20e 100644
+--- a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java
++++ b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java
+@@ -15,9 +15,11 @@ import org.osgi.framework.ServiceFactory;
+ import org.osgi.framework.ServiceReference;
+ import org.osgi.framework.ServiceRegistration;
+ import org.osgi.service.log.LogEntry;
++import org.osgi.service.log.LogLevel;
+ import org.osgi.service.log.LogListener;
+ import org.osgi.service.log.LogReaderService;
+ import org.osgi.service.log.LogService;
++import org.osgi.service.log.Logger;
+ 
+ @Deprecated // see biz.aQute.bnd.remote.junit
+ public class ConsoleLogger implements LogReaderService {
+@@ -76,6 +78,36 @@ public class ConsoleLogger implements LogReaderService {
+ 			return time;
+ 		}
+ 
++		@Override
++		public LogLevel getLogLevel() {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
++		@Override
++		public String getLoggerName() {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
++		@Override
++		public long getSequence() {
++			// TODO Auto-generated method stub
++			return 0;
++		}
++
++		@Override
++		public String getThreadInfo() {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
++		@Override
++		public StackTraceElement getLocation() {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
+ 	}
+ 
+ 	public class Facade implements LogService {
+@@ -112,6 +144,36 @@ public class ConsoleLogger implements LogReaderService {
+ 
+ 		}
+ 
++		@Override
++		public Logger getLogger(String name) {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
++		@Override
++		public Logger getLogger(Class<?> clazz) {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
++		@Override
++		public <L extends Logger> L getLogger(String name, Class<L> loggerType) {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
++		@Override
++		public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
++		@Override
++		public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {
++			// TODO Auto-generated method stub
++			return null;
++		}
++
+ 	}
+ 
+ 	public ConsoleLogger(BundleContext context) {
+-- 
+2.20.1
+
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index fa4535a..6063ee4 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,7 +1,6 @@
-
 Name:           aqute-bnd
-Version:        3.5.0
-Release:        6%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0
@@ -22,16 +21,12 @@ Source6:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annot
 
 Patch0:         0001-Disable-removed-commands.patch
 Patch1:         0002-Fix-ant-compatibility.patch
-Patch2:         0001-Port-to-OSGI-7.0.0.patch
+Patch2:         0003-Port-to-OSGI-7.0.0.patch
 
 BuildRequires:  maven-local
-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.apache.ant:ant)
+BuildRequires:  mvn(jline:jline)
 BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -39,7 +34,14 @@ BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.shared:maven-mapping)
+BuildRequires:  mvn(org.assertj:assertj-core)
 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)
 # Explicit javapackages-tools requires since bnd script uses
 # /usr/share/java-utils/java-functions
@@ -91,12 +93,12 @@ rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java
 sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml
 sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
 
-
-
 # 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.cmpn
 %pom_add_dep org.slf4j:slf4j-api
 popd
@@ -111,7 +113,8 @@ 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.annotation
 %pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
@@ -121,33 +124,29 @@ cp -p %{SOURCE5} pom.xml
 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_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version}
-%pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
-%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
-%pom_add_dep org.apache.ant:ant
-%pom_add_dep org.osgi:osgi.annotation
-%pom_add_dep org.osgi:osgi.core
-%pom_add_dep org.osgi:osgi.cmpn
-%pom_add_dep org.slf4j:slf4j-api
-
-%pom_add_dep org.slf4j:slf4j-simple::runtime
+%pom_remove_dep :biz.aQute.resolve
+%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 :biz.aQute.launchpad
+%pom_remove_dep :snakeyaml
 popd
 
 # 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
 pushd maven
-rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java
-%pom_remove_dep -r :biz.aQute.resolve
-%pom_remove_dep -r :biz.aQute.repository
+%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-resolver-maven-plugin
 %pom_disable_module bnd-testing-maven-plugin
+%pom_disable_module bnd-run-maven-plugin
 # Integration tests require Internet access
 %pom_remove_plugin -r :maven-invoker-plugin
 %pom_remove_plugin -r :maven-javadoc-plugin
@@ -155,14 +154,12 @@ rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyReso
 %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
 
 %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-shared-maven-lib maven
 %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
@@ -193,6 +190,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* 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
 
diff --git a/parent.pom b/parent.pom
index e8bc7b0..e637e27 100644
--- a/parent.pom
+++ b/parent.pom
@@ -186,10 +186,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/sources b/sources
index 8772cbe..9fe5d2e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (3.5.0.REL.tar.gz) = c0e1fb6370881ab5012bbfbeae8093c23b25083a8a82599a9ae1179d8efc051c3b4a5cf99473072b7cf1e84440e08f19a5731b6f3c8bb805f849aa4823c16062
-SHA512 (aQute.libg-3.5.0.pom) = 81a7f1350296c2bdd48755c38804520c80df2ed968186a35842284d55b4ac951092646c780a5bc91fca161f43515e3061b9003aa6674dd199297159b9a59eb60
-SHA512 (biz.aQute.bnd-3.5.0.pom) = 60ff58f4d366dccb26cee5ac3d0749a564e0eab41b4e493df1727c7a79d7159f0913d3d1dcd406963580b7063d8b76cd92088d9eee46a01a0f9dd33643a5c345
-SHA512 (biz.aQute.bndlib-3.5.0.pom) = 3987110f4fc1bedb13f3ad777cb33dc9db75ad81135fcbc49763dfb243c5053ea864d76d16f271547666c01f6dfbb104a9d4ee52496e62e6fb80dcfc02d23f75
-SHA512 (biz.aQute.bnd.annotation-3.5.0.pom) = c968e0586f55accb37d4caf4d8a6d509fd6f88982dcc464cfb0fd41f863eb0b7945aadafb97c79ba2d6d1fda59ef12e5bac4556e302599924130d69fb99ac31f
+SHA512 (4.2.0.REL.tar.gz) = 3fc4cf6340708d7594348a06678b11782392f14e785b1097255d4af005ab9bd24d71d61bda9644aba3cfba2002cb220cb356e2b2e686deb0cbefecc5dcd03a40
+SHA512 (aQute.libg-4.2.0.pom) = 97d141b37631987f537f9c01c86cb66514e715af335765e956e7a99633cd3f473ce75a9152b6bc21fb3e7bc33bde1ec3b77ce814f9df8d1f0f542e8fe37e723a
+SHA512 (biz.aQute.bnd-4.2.0.pom) = cf65171a1562648f4b376d21db73b1685b7acaa56a8912245e982f202e05a9e0f9cb47dae5b1ac950c5441596bf52883f171fbf515a4cb040bdef44f74b795ed
+SHA512 (biz.aQute.bndlib-4.2.0.pom) = 2dcf0e61232ca5d3450b11a701c1462a42e4292a0905134be9507c1cace123d47148d12a420c71c21a0942367cc6e3e1f06a701c061acab26151c8c0fdda0599
+SHA512 (biz.aQute.bnd.annotation-4.2.0.pom) = 075a3d63d08e5c9076090e79c35ae9aaef2ccd121b5ace35f28d46f11242894c8059258c2d6764691d16ccfe17cf2b2038132cd670e758d501732d34a592df17

From d9820b39e629670a8028499c3401c0b66f3fa384 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 24 Jul 2019 15:45:39 +0200
Subject: [PATCH 05/14] Fix patch file

---
 0002-Fix-ant-compatibility.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/0002-Fix-ant-compatibility.patch b/0002-Fix-ant-compatibility.patch
index 916012f..7363bb7 100644
--- a/0002-Fix-ant-compatibility.patch
+++ b/0002-Fix-ant-compatibility.patch
@@ -15,7 +15,7 @@ index dd438a5..6b714be 100644
  				if (inherit) {
  					Properties projectProperties = new UTF8Properties();
  					@SuppressWarnings("unchecked")
--					Hashtable<Object,Object> antProps = getProject().getProperties();
+-					Hashtable<Object, Object> antProps = getProject().getProperties();
 +					Hashtable<String,Object> antProps = getProject().getProperties();
  					projectProperties.putAll(antProps);
  					projectProperties.putAll(builder.getProperties());

From 207821d52e0e58fc61b0a42b3a93b1edc1616a72 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 23 Oct 2019 08:35:23 +0200
Subject: [PATCH 06/14] Update to upstream version 4.3.0

---
 .gitignore                          |  5 +++++
 0001-Disable-removed-commands.patch | 21 ++++++++++-----------
 aqute-bnd.spec                      | 15 +++++++++------
 sources                             | 10 +++++-----
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index a63b4ca..3763059 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,8 @@
 /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
diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch
index 4f818fa..a7202b8 100644
--- a/0001-Disable-removed-commands.patch
+++ b/0001-Disable-removed-commands.patch
@@ -4,14 +4,14 @@ 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 | 49 -----------------------
- 1 file changed, 49 deletions(-)
+ 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 0e6f055..166687b 100644
+index 3f21168..d6c9ccd 100644
 --- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
 +++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-@@ -108,7 +108,6 @@ import aQute.bnd.osgi.Processor;
+@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Processor;
  import aQute.bnd.osgi.Resource;
  import aQute.bnd.osgi.Verifier;
  import aQute.bnd.osgi.eclipse.EclipseClasspath;
@@ -19,13 +19,13 @@ index 0e6f055..166687b 100644
  import aQute.bnd.service.Actionable;
  import aQute.bnd.service.RepositoryPlugin;
  import aQute.bnd.service.action.Action;
-@@ -4225,54 +4224,6 @@ public class bnd extends Processor {
+@@ -4213,53 +4212,6 @@ public class bnd extends Processor {
  		getInfo(profiles);
  	}
  
 -	/**
 -	 * Resolve command
--	 * 
+-	 *
 -	 * @throws Exception
 -	 */
 -
@@ -41,7 +41,7 @@ index 0e6f055..166687b 100644
 -
 -	/**
 -	 * Remote command
--	 * 
+-	 *
 -	 * @throws Exception
 -	 */
 -
@@ -57,7 +57,7 @@ index 0e6f055..166687b 100644
 -
 -	/**
 -	 * Nexus commands
--	 * 
+-	 *
 -	 * @throws Exception
 -	 */
 -
@@ -70,10 +70,9 @@ index 0e6f055..166687b 100644
 -		getInfo(rc);
 -		rc.close();
 -	}
--
+ 
  	/**
  	 * Export a bndrun file
- 	 */
 -- 
-2.20.1
+2.21.0
 
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 6063ee4..418258c 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,5 +1,5 @@
 Name:           aqute-bnd
-Version:        4.2.0
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
@@ -99,14 +99,16 @@ 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
-%pom_add_dep org.slf4j:slf4j-api
 popd
 
 # bndlib.annotations
 pushd biz.aQute.bnd.annotation
 cp -p %{SOURCE6} pom.xml
 %pom_add_parent biz.aQute.bnd:parent:%{version}
+%pom_add_dep org.osgi:osgi.core
+%pom_add_dep org.osgi:osgi.cmpn
 popd
 
 # bndlib
@@ -115,10 +117,8 @@ 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.annotation
 %pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
-%pom_add_dep org.slf4j:slf4j-api
 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
 %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
 popd
@@ -132,7 +132,6 @@ cp -p %{SOURCE4} pom.xml
 %pom_remove_dep :biz.aQute.bnd.exporters
 %pom_remove_dep :biz.aQute.bnd.reporter
 %pom_remove_dep :biz.aQute.remote.api
-%pom_remove_dep :biz.aQute.launchpad
 %pom_remove_dep :snakeyaml
 popd
 
@@ -144,9 +143,10 @@ pushd maven
 %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-testing-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
@@ -190,6 +190,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* Wed Oct 09 2019 Marian Koncek <mkoncek@redhat.com> - 4.3.0-1
+- Update to upstream version 4.3.0
+
 * Thu Jul 04 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
 - Update to upstream version 4.2.0
 
diff --git a/sources b/sources
index 9fe5d2e..ebf3d61 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (4.2.0.REL.tar.gz) = 3fc4cf6340708d7594348a06678b11782392f14e785b1097255d4af005ab9bd24d71d61bda9644aba3cfba2002cb220cb356e2b2e686deb0cbefecc5dcd03a40
-SHA512 (aQute.libg-4.2.0.pom) = 97d141b37631987f537f9c01c86cb66514e715af335765e956e7a99633cd3f473ce75a9152b6bc21fb3e7bc33bde1ec3b77ce814f9df8d1f0f542e8fe37e723a
-SHA512 (biz.aQute.bnd-4.2.0.pom) = cf65171a1562648f4b376d21db73b1685b7acaa56a8912245e982f202e05a9e0f9cb47dae5b1ac950c5441596bf52883f171fbf515a4cb040bdef44f74b795ed
-SHA512 (biz.aQute.bndlib-4.2.0.pom) = 2dcf0e61232ca5d3450b11a701c1462a42e4292a0905134be9507c1cace123d47148d12a420c71c21a0942367cc6e3e1f06a701c061acab26151c8c0fdda0599
-SHA512 (biz.aQute.bnd.annotation-4.2.0.pom) = 075a3d63d08e5c9076090e79c35ae9aaef2ccd121b5ace35f28d46f11242894c8059258c2d6764691d16ccfe17cf2b2038132cd670e758d501732d34a592df17
+SHA512 (4.3.0.REL.tar.gz) = 0bae90a388fb52b9af88457b2a9b78530958be72567d66a0369c534df1aad7f2e7dae13e97a7153f847283b8fc31b1f76ef00c88944076a35e64b9e596925fec
+SHA512 (aQute.libg-4.3.0.pom) = a60d7d41a3eae51827e30a683b078087dde2d7f1dca79a4acccee1e25df84f7498a3be01eea69bc06eba355f3df490452dd8edbac469c294b34327dd46802c9e
+SHA512 (biz.aQute.bnd-4.3.0.pom) = e9b4f64359965c1b7799e545212f269fa5ced54d28160079e111529609b22e45eb9f0f0853e7270734cb2d468cbd4127601dcfe523d53ec2ba7c6af8f50f5346
+SHA512 (biz.aQute.bndlib-4.3.0.pom) = d74384a5d3f590d10a29b47734365eae1cdcf566bbab5a193db9b31fd64133091a2fe836e035f2add6c21b12a537bd3618c03d3b3e5412ccf8ff7765097a2df7
+SHA512 (biz.aQute.bnd.annotation-4.3.0.pom) = ef578cea5b1773e307f168ef27d91344f6f7d7ac874ff841e1831ff12ec741a568777931a29528a55812afed737af893740b8d812de4c72d8d9e07c027b56cd6

From 0ca7cbc4b4341d302c5713999dee369595eff46e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 5 Nov 2019 15:01:28 +0100
Subject: [PATCH 07/14] Remove build dependency on jline

---
 aqute-bnd.spec | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 418258c..4dc11f6 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -24,18 +24,14 @@ Patch1:         0002-Fix-ant-compatibility.patch
 Patch2:         0003-Port-to-OSGI-7.0.0.patch
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(jline:jline)
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.ant:ant)
+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.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires:  mvn(org.apache.maven.shared:maven-mapping)
-BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
 BuildRequires:  mvn(org.osgi:osgi.annotation)
 BuildRequires:  mvn(org.osgi:osgi.cmpn)
@@ -43,6 +39,7 @@ 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)
+
 # Explicit javapackages-tools requires since bnd script uses
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
@@ -133,6 +130,7 @@ cp -p %{SOURCE4} pom.xml
 %pom_remove_dep :biz.aQute.bnd.reporter
 %pom_remove_dep :biz.aQute.remote.api
 %pom_remove_dep :snakeyaml
+%pom_remove_dep :jline
 popd
 
 # maven-plugins

From 4ceb7fb63914cedcb7fc524372f18f1d77087048 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 5 Nov 2019 17:29:27 +0100
Subject: [PATCH 08/14] Mass rebuild for javapackages-tools 201902

---
 aqute-bnd.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 4dc11f6..6f04b66 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,6 +1,6 @@
 Name:           aqute-bnd
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0
@@ -188,6 +188,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* 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
 

From bebc26f4dabccdf9706970339aee91e212d53d70 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 29 Jan 2020 13:52:31 +0100
Subject: [PATCH 09/14] Update to upstream version 5.0.0

---
 .gitignore     |  5 +++++
 aqute-bnd.spec |  7 +++++--
 sources        | 10 +++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3763059..7b524c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,8 @@
 /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
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 6f04b66..2c0fec0 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,6 +1,6 @@
 Name:           aqute-bnd
-Version:        4.3.0
-Release:        2%{?dist}
+Version:        5.0.0
+Release:        1%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0
@@ -188,6 +188,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.0.0-1
+- Update to upstream version 5.0.0
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.0-2
 - Mass rebuild for javapackages-tools 201902
 
diff --git a/sources b/sources
index ebf3d61..d5d7fd0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (4.3.0.REL.tar.gz) = 0bae90a388fb52b9af88457b2a9b78530958be72567d66a0369c534df1aad7f2e7dae13e97a7153f847283b8fc31b1f76ef00c88944076a35e64b9e596925fec
-SHA512 (aQute.libg-4.3.0.pom) = a60d7d41a3eae51827e30a683b078087dde2d7f1dca79a4acccee1e25df84f7498a3be01eea69bc06eba355f3df490452dd8edbac469c294b34327dd46802c9e
-SHA512 (biz.aQute.bnd-4.3.0.pom) = e9b4f64359965c1b7799e545212f269fa5ced54d28160079e111529609b22e45eb9f0f0853e7270734cb2d468cbd4127601dcfe523d53ec2ba7c6af8f50f5346
-SHA512 (biz.aQute.bndlib-4.3.0.pom) = d74384a5d3f590d10a29b47734365eae1cdcf566bbab5a193db9b31fd64133091a2fe836e035f2add6c21b12a537bd3618c03d3b3e5412ccf8ff7765097a2df7
-SHA512 (biz.aQute.bnd.annotation-4.3.0.pom) = ef578cea5b1773e307f168ef27d91344f6f7d7ac874ff841e1831ff12ec741a568777931a29528a55812afed737af893740b8d812de4c72d8d9e07c027b56cd6
+SHA512 (5.0.0.REL.tar.gz) = 2ab00d727fdd4bd8051a19c93d1e9bca498a0de7f0cc5df3401d00a48ed65e2ab96c400ee6b5a6c31ab182f3a58c4be74816d2073af3878202873804a45e1d1f
+SHA512 (aQute.libg-5.0.0.pom) = 28022d0c44bb0c1ef0f5340d4baaf85cf93f819a8863d155037b65fa6f48c1f7e8c76547b2a07cee6f17a5f05a8658ce79f8d1ca129dd29fab9ce99195cbf9f9
+SHA512 (biz.aQute.bnd-5.0.0.pom) = 3134349aa135ccb55cf590de4c7e61302a0f1f180d63c445033728108f61e06ad0571c6c9b17d94ed1d87040b90addf90c03ad5c821cc708190adcabfc87a9c5
+SHA512 (biz.aQute.bnd.annotation-5.0.0.pom) = 8b7b3fc57b6b2662bacd6ff3875de826cceeb5e1e17bd9b66c830f9bd038279851bc1a668a869adac1aee06ce0a9b3586ec4ec1ff6da3749e44cb7a051d3be77
+SHA512 (biz.aQute.bndlib-5.0.0.pom) = 80fb772300d0c5aa3ab347bfbad14da190e6f39edb46003f71633a03b8dfc8c7282b33548fbcbe4f12cf5f4c96b7c2a56ec323d68a9052772b3e2ad34718f16d

From 10265c50cc1ea0ab578e43a3fc9c83e362d816f9 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 24 Apr 2020 13:26:09 +0200
Subject: [PATCH 10/14] Disable bnd-maven-plugin

---
 aqute-bnd.spec | 44 ++++----------------------------------------
 parent.pom     |  1 -
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 2c0fec0..d6463f9 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,6 +1,6 @@
 Name:           aqute-bnd
 Version:        5.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0
@@ -24,21 +24,11 @@ Patch1:         0002-Fix-ant-compatibility.patch
 Patch2:         0003-Port-to-OSGI-7.0.0.patch
 
 BuildRequires:  maven-local
-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.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)
 
 # Explicit javapackages-tools requires since bnd script uses
 # /usr/share/java-utils/java-functions
@@ -63,12 +53,6 @@ Summary:        BND library
 %description -n aqute-bndlib
 %{summary}.
 
-%package -n bnd-maven-plugin
-Summary:        BND Maven plugin
-
-%description -n bnd-maven-plugin
-%{summary}.
-
 %package javadoc
 Summary:        Javadoc for %{name}
 
@@ -133,33 +117,12 @@ cp -p %{SOURCE4} pom.xml
 %pom_remove_dep :jline
 popd
 
-# 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
-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
 
 %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
 
@@ -182,12 +145,13 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %files -n aqute-bndlib -f .mfiles-bndlib
 %license LICENSE
 
-%files -n bnd-maven-plugin -f .mfiles-maven
-
 %files javadoc -f .mfiles-javadoc
 %license LICENSE
 
 %changelog
+* 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
 
diff --git a/parent.pom b/parent.pom
index e637e27..fbff4e5 100644
--- a/parent.pom
+++ b/parent.pom
@@ -168,7 +168,6 @@
         <module>biz.aQute.bndlib</module>
         <module>biz.aQute.bnd</module>
         <module>biz.aQute.bnd.annotation</module>
-        <module>maven</module>
     </modules>
 
     <build>

From 6e9f599fd067b188a2e5ceaf384cb3b4e0ed25b0 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Tue, 23 Jun 2020 13:52:00 +0200
Subject: [PATCH 11/14] Update to upstream version 5.1.1

---
 .gitignore                          |  5 ++++
 0001-Disable-removed-commands.patch | 17 +++++++------
 aqute-bnd.spec                      | 39 ++++++++++++++++++-----------
 generate-tarball.sh                 | 31 +++++++++++++++++++++++
 repack-tarball.sh                   |  6 -----
 sources                             | 10 ++++----
 6 files changed, 74 insertions(+), 34 deletions(-)
 create mode 100755 generate-tarball.sh
 delete mode 100755 repack-tarball.sh

diff --git a/.gitignore b/.gitignore
index 7b524c0..e819651 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,8 @@
 /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
diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch
index a7202b8..a654027 100644
--- a/0001-Disable-removed-commands.patch
+++ b/0001-Disable-removed-commands.patch
@@ -4,22 +4,22 @@ 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(-)
+ biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 49 -----------------------
+ 1 file changed, 49 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 6870935..803c6c9 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;
- import aQute.bnd.osgi.Resource;
+@@ -104,7 +104,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.service.Actionable;
  import aQute.bnd.service.RepositoryPlugin;
  import aQute.bnd.service.action.Action;
-@@ -4213,53 +4212,6 @@ public class bnd extends Processor {
+@@ -3904,54 +3903,6 @@ public class bnd extends Processor {
  		getInfo(profiles);
  	}
  
@@ -70,9 +70,10 @@ index 3f21168..d6c9ccd 100644
 -		getInfo(rc);
 -		rc.close();
 -	}
- 
+-
  	/**
  	 * Export a bndrun file
+ 	 */
 -- 
-2.21.0
+2.25.4
 
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index d6463f9..6d4ba9b 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,17 +1,17 @@
 Name:           aqute-bnd
-Version:        5.0.0
-Release:        2%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
-License:        ASL 2.0
-URL:            http://bnd.bndtools.org/
+License:        ASL 2.0 or EPL-2.0
+URL:            https://bnd.bndtools.org/
 BuildArch:      noarch
 
-Source0:        %{version}.REL.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 # removes bundled jars from upstream tarball
 # run as:
-# ./repack-tarball.sh
-Source1:        repack-tarball.sh
+# ./generate-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
@@ -60,9 +60,7 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n bnd-%{version}.REL
-
-rm gradlew*
+%setup -q
 
 %patch0 -p1
 %patch1 -p1
@@ -78,13 +76,11 @@ sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd
 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}
@@ -96,8 +92,6 @@ 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}
@@ -108,6 +102,7 @@ popd
 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_remove_dep org.apache.ant:ant
 %pom_remove_dep :biz.aQute.resolve
 %pom_remove_dep :biz.aQute.repository
 %pom_remove_dep :biz.aQute.bnd.exporters
@@ -117,6 +112,17 @@ cp -p %{SOURCE4} pom.xml
 %pom_remove_dep :jline
 popd
 
+%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
+
 %mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
 %mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib
 
@@ -149,6 +155,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* 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
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
new file mode 100755
index 0000000..13e2cb8
--- /dev/null
+++ b/generate-tarball.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+set -e
+
+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"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+pushd tarball-tmp
+tar -xf "../${name}-${version}.orig.tar.gz"
+mv "bnd-${version}.REL" "${name}-${version}"
+
+# CLEAN TARBALL
+rm -rf "${name}-${version}/docs"
+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"
diff --git a/repack-tarball.sh b/repack-tarball.sh
deleted file mode 100755
index a770dd0..0000000
--- a/repack-tarball.sh
+++ /dev/null
@@ -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
diff --git a/sources b/sources
index d5d7fd0..4516208 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (5.0.0.REL.tar.gz) = 2ab00d727fdd4bd8051a19c93d1e9bca498a0de7f0cc5df3401d00a48ed65e2ab96c400ee6b5a6c31ab182f3a58c4be74816d2073af3878202873804a45e1d1f
-SHA512 (aQute.libg-5.0.0.pom) = 28022d0c44bb0c1ef0f5340d4baaf85cf93f819a8863d155037b65fa6f48c1f7e8c76547b2a07cee6f17a5f05a8658ce79f8d1ca129dd29fab9ce99195cbf9f9
-SHA512 (biz.aQute.bnd-5.0.0.pom) = 3134349aa135ccb55cf590de4c7e61302a0f1f180d63c445033728108f61e06ad0571c6c9b17d94ed1d87040b90addf90c03ad5c821cc708190adcabfc87a9c5
-SHA512 (biz.aQute.bnd.annotation-5.0.0.pom) = 8b7b3fc57b6b2662bacd6ff3875de826cceeb5e1e17bd9b66c830f9bd038279851bc1a668a869adac1aee06ce0a9b3586ec4ec1ff6da3749e44cb7a051d3be77
-SHA512 (biz.aQute.bndlib-5.0.0.pom) = 80fb772300d0c5aa3ab347bfbad14da190e6f39edb46003f71633a03b8dfc8c7282b33548fbcbe4f12cf5f4c96b7c2a56ec323d68a9052772b3e2ad34718f16d
+SHA512 (aqute-bnd-5.1.1.tar.gz) = 3e73480e28e2d39ae7537d6edcb287b2a3a51da5966c15c6c08cf91e7d22a0d499055a2eb5acc25077f0b78b3ee1014cdb2b71766cd8554c9cab26e307ca9a38
+SHA512 (aQute.libg-5.1.1.pom) = e5410707927551574021661f1c83c31a519b5fa82d8342520e6a71c70aa5205f3898076c9ae3875253404e36d9f8f5b901e0cda6a8c68d6d4800ee530cda501c
+SHA512 (biz.aQute.bnd-5.1.1.pom) = ff684334f0b9c62d581bed4d7b6cacba5a8240d402f3ab9d56c72fac01b2606ac2948700d5b3c887abac5b26d1d958c9514bcbd7b51a4f5854654e44585c2cf1
+SHA512 (biz.aQute.bnd.annotation-5.1.1.pom) = 4e43902c9c55d2546c5a9f8f4390f0454012a33f5a755de13f5bbf0c0c78b3e5094664a388d3b54bcb2729abb7410eb5625379019d5a6ff169e79f62728d960a
+SHA512 (biz.aQute.bndlib-5.1.1.pom) = d0ebe4258a0767c663a15910eafba78a1e4a0a9363a3b345bcaf70d66d7903d886e84df7b93e4a2fa036f1682e688dbde03592683fc0a7cc4b9134886b777ea6

From 242ca7154ae5504ec5261d299dd28ccebb7e7009 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Tue, 29 Sep 2020 14:22:34 +0200
Subject: [PATCH 12/14] Update to upstream version 5.1.2

---
 .gitignore     |  5 +++++
 aqute-bnd.spec |  5 ++++-
 sources        | 10 +++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e819651..f608faa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,8 @@
 /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
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 6d4ba9b..b6400d3 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,5 +1,5 @@
 Name:           aqute-bnd
-Version:        5.1.1
+Version:        5.1.2
 Release:        1%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
@@ -155,6 +155,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* Tue Sep 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.2-1
+- Update to upstream version 5.1.2
+
 * Tue Jun 23 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.1-1
 - Update to upstream version 5.1.1
 
diff --git a/sources b/sources
index 4516208..951c14b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (aqute-bnd-5.1.1.tar.gz) = 3e73480e28e2d39ae7537d6edcb287b2a3a51da5966c15c6c08cf91e7d22a0d499055a2eb5acc25077f0b78b3ee1014cdb2b71766cd8554c9cab26e307ca9a38
-SHA512 (aQute.libg-5.1.1.pom) = e5410707927551574021661f1c83c31a519b5fa82d8342520e6a71c70aa5205f3898076c9ae3875253404e36d9f8f5b901e0cda6a8c68d6d4800ee530cda501c
-SHA512 (biz.aQute.bnd-5.1.1.pom) = ff684334f0b9c62d581bed4d7b6cacba5a8240d402f3ab9d56c72fac01b2606ac2948700d5b3c887abac5b26d1d958c9514bcbd7b51a4f5854654e44585c2cf1
-SHA512 (biz.aQute.bnd.annotation-5.1.1.pom) = 4e43902c9c55d2546c5a9f8f4390f0454012a33f5a755de13f5bbf0c0c78b3e5094664a388d3b54bcb2729abb7410eb5625379019d5a6ff169e79f62728d960a
-SHA512 (biz.aQute.bndlib-5.1.1.pom) = d0ebe4258a0767c663a15910eafba78a1e4a0a9363a3b345bcaf70d66d7903d886e84df7b93e4a2fa036f1682e688dbde03592683fc0a7cc4b9134886b777ea6
+SHA512 (aqute-bnd-5.1.2.tar.gz) = a4ae9c5f0c480a5c651e9d7e37e39e836a88a5a7fc5845aefa4b4e1f6d632df5e195af81fe6eae354b54f7b520a313ebc2642fff10692011b853301534cb8d4d
+SHA512 (aQute.libg-5.1.2.pom) = a1d093a693aa634847dd39844ac262d43c2e048335c21238c809de89e830dc2a5b63f6d5560b597a25626527c3674ee6488fc8573652b7005c367cfc97f71cb5
+SHA512 (biz.aQute.bnd-5.1.2.pom) = 463a161ac46492a8a8a05408e2a5482f3e234c6de602108aab02533ee446d55c45178b2d7698901d9c045fc604eb0b183afa30c0624f1da30494c75a32923a92
+SHA512 (biz.aQute.bnd.annotation-5.1.2.pom) = 516388140579187573cb124f562d5595a42f9cec9964c12933a419bc225f7444f8d346a62229e3dbd2357afb6c4dca938f3e84e2caf628ff59865da1072e1805
+SHA512 (biz.aQute.bndlib-5.1.2.pom) = dd01c1f40b4f734eb6c2beb6157855ab047b8076309ddaa462d9cb47717ee7bcd989c94eca81f3314acad7495ee95db3bf4b0fa0ce0d06b5dfda04e341074fa6

From 02305b24e4ac710ab209c668c1065b8742b67200 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 20 Jan 2021 16:17:42 +0100
Subject: [PATCH 13/14] Update to upstream version 5.2.0

---
 .gitignore                                    |  5 ++++
 0002-Fix-ant-compatibility.patch              | 25 -------------------
 ...0.0.patch => 0002-Port-to-OSGI-7.0.0.patch |  0
 aqute-bnd.spec                                | 13 +++++-----
 sources                                       | 10 ++++----
 5 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100644 0002-Fix-ant-compatibility.patch
 rename 0003-Port-to-OSGI-7.0.0.patch => 0002-Port-to-OSGI-7.0.0.patch (100%)

diff --git a/.gitignore b/.gitignore
index f608faa..1811764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,8 @@
 /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
diff --git a/0002-Fix-ant-compatibility.patch b/0002-Fix-ant-compatibility.patch
deleted file mode 100644
index 7363bb7..0000000
--- a/0002-Fix-ant-compatibility.patch
+++ /dev/null
@@ -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
-
diff --git a/0003-Port-to-OSGI-7.0.0.patch b/0002-Port-to-OSGI-7.0.0.patch
similarity index 100%
rename from 0003-Port-to-OSGI-7.0.0.patch
rename to 0002-Port-to-OSGI-7.0.0.patch
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index b6400d3..78aad69 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,5 +1,5 @@
 Name:           aqute-bnd
-Version:        5.1.2
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
@@ -19,9 +19,8 @@ Source4:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{ver
 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
 
-Patch0:         0001-Disable-removed-commands.patch
-Patch1:         0002-Fix-ant-compatibility.patch
-Patch2:         0003-Port-to-OSGI-7.0.0.patch
+Patch1:         0001-Disable-removed-commands.patch
+Patch2:         0002-Port-to-OSGI-7.0.0.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.osgi:osgi.annotation)
@@ -62,7 +61,6 @@ API documentation for %{name}.
 %prep
 %setup -q
 
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
@@ -102,8 +100,8 @@ popd
 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_remove_dep org.apache.ant:ant
 %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
@@ -155,6 +153,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 5.2.0-1
+- Update to upstream version 5.2.0
+
 * Tue Sep 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.2-1
 - Update to upstream version 5.1.2
 
diff --git a/sources b/sources
index 951c14b..dd11148 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (aqute-bnd-5.1.2.tar.gz) = a4ae9c5f0c480a5c651e9d7e37e39e836a88a5a7fc5845aefa4b4e1f6d632df5e195af81fe6eae354b54f7b520a313ebc2642fff10692011b853301534cb8d4d
-SHA512 (aQute.libg-5.1.2.pom) = a1d093a693aa634847dd39844ac262d43c2e048335c21238c809de89e830dc2a5b63f6d5560b597a25626527c3674ee6488fc8573652b7005c367cfc97f71cb5
-SHA512 (biz.aQute.bnd-5.1.2.pom) = 463a161ac46492a8a8a05408e2a5482f3e234c6de602108aab02533ee446d55c45178b2d7698901d9c045fc604eb0b183afa30c0624f1da30494c75a32923a92
-SHA512 (biz.aQute.bnd.annotation-5.1.2.pom) = 516388140579187573cb124f562d5595a42f9cec9964c12933a419bc225f7444f8d346a62229e3dbd2357afb6c4dca938f3e84e2caf628ff59865da1072e1805
-SHA512 (biz.aQute.bndlib-5.1.2.pom) = dd01c1f40b4f734eb6c2beb6157855ab047b8076309ddaa462d9cb47717ee7bcd989c94eca81f3314acad7495ee95db3bf4b0fa0ce0d06b5dfda04e341074fa6
+SHA512 (aqute-bnd-5.2.0.tar.gz) = 4001b991b80746140c26aa4862e43aed82685344343a07b41aca9e7466d1bc180eec4724c1eef8186c7fdf69dedd6817cc30a790807ce8344958e2ea0633d015
+SHA512 (aQute.libg-5.2.0.pom) = 700b698895c39f39422e66532fee626aace0656867361b7e41438a168f2725ae25c5f67e6fd1dfdcff228ec4e6a6530cc76dc1b1f40aa797ef90bb891f3e4f86
+SHA512 (biz.aQute.bnd-5.2.0.pom) = b8cebc4fa358debf2296e24b2cde2f401765a628022f0972517dbaecc78558aadcddbfc3cc1c8e1c0332008864d14e76863d46f51aacb1a6a530b2577ebdc587
+SHA512 (biz.aQute.bnd.annotation-5.2.0.pom) = ef10eea989b339e4166087b2baf2fb4b49693d9933498f8299356b5a40a5a155d6c725a298eb0c93cdfe9633acc147047d341f84b0a9a3e5b094827168d179a1
+SHA512 (biz.aQute.bndlib-5.2.0.pom) = 4055bc35223f7c90e933ce7e694bb436743b0d138a9d21cde3ba87579e7d8be2614edbddc21c0447dba911e6ddd8a607a86ec08eb09c120653846dcb9b667462

From b7662dfe43f7a2e8f054b630ea2ff4038d92093d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 16 Apr 2021 15:33:12 +0200
Subject: [PATCH 14/14] Conditionalize buildrequires in bootstrap mode

---
 aqute-bnd.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 78aad69..304ba7a 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,3 +1,5 @@
+%bcond_without bootstrap
+
 Name:           aqute-bnd
 Version:        5.2.0
 Release:        1%{?dist}
@@ -23,11 +25,15 @@ 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:  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
 
 # Explicit javapackages-tools requires since bnd script uses
 # /usr/share/java-utils/java-functions