Update to upstream version 3.4.0

2017-09-12 20:18:25 +03:00 · 2017-09-12 20:18:25 +03:00 · d47c92610f
commit d47c92610f
parent 4624924dae
7 changed files with 64 additions and 98 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,8 @@
 /biz.aQute.bnd-3.3.0.pom
 /biz.aQute.bndlib-3.3.0.pom
 /biz.aQute.bnd.annotation-3.3.0.pom
+/3.4.0.REL.tar.gz
+/aQute.libg-3.4.0.pom
+/biz.aQute.bnd-3.4.0.pom
+/biz.aQute.bndlib-3.4.0.pom
+/biz.aQute.bnd.annotation-3.4.0.pom
--- a/0001-Disable-removed-commands.patch
+++ b/0001-Disable-removed-commands.patch
@ -1,17 +1,17 @@
-From fbc8e82303b4168ff9fcd7bc6cabd5e65a5b7495 Mon Sep 17 00:00:00 2001
+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 2/2] Disable removed commands
+Subject: [PATCH 1/2] Disable removed commands

 ---
 biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 45 -------------------------------
 1 file changed, 45 deletions(-)

 diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-index 8cd120d..1ceb4c6 100644
+index 1cc3216..c669e4a 100644
 --- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
 +++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-@@ -100,7 +100,6 @@ import aQute.bnd.osgi.Processor;
+@@ -105,7 +105,6 @@ import aQute.bnd.osgi.Processor;
 import aQute.bnd.osgi.Resource;
 import aQute.bnd.osgi.Verifier;
 import aQute.bnd.osgi.eclipse.EclipseClasspath;
@ -19,7 +19,7 @@ index 8cd120d..1ceb4c6 100644
 import aQute.bnd.service.Actionable;
 import aQute.bnd.service.RepositoryPlugin;
 import aQute.bnd.service.action.Action;
-@@ -4136,50 +4135,6 @@ public class bnd extends Processor {
+@@ -4064,50 +4063,6 @@ public class bnd extends Processor {
 	}
 
 	/**
@ -71,5 +71,5 @@ index 8cd120d..1ceb4c6 100644
 	 */
 
 -- 
-2.7.4
+2.13.5

--- a/0001-Port-to-Java-8.patch
+++ b/0001-Port-to-Java-8.patch
@ -1,76 +0,0 @@
-From 2da86d459a4806760d2883ed3c6296f904c80593 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Thu, 26 May 2016 15:43:14 +0200
-Subject: [PATCH 1/2] Port to Java 8
-
---
- aQute.libg/src/aQute/lib/collections/DoubleKeyMap.java | 14 --------------
- aQute.libg/src/aQute/lib/collections/SortedList.java   |  6 ++++++
- biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java           |  2 +-
- 3 files changed, 7 insertions(+), 15 deletions(-)
-
-diff --git a/aQute.libg/src/aQute/lib/collections/DoubleKeyMap.java b/aQute.libg/src/aQute/lib/collections/DoubleKeyMap.java
-index 4107f31..40ecfdf 100644
--- a/aQute.libg/src/aQute/lib/collections/DoubleKeyMap.java
-+++ b/aQute.libg/src/aQute/lib/collections/DoubleKeyMap.java
-@@ -97,20 +97,6 @@ public class DoubleKeyMap<K1, K2, V> extends HashMap<K1,Map<K2,V>>implements Map
- 		return result;
- 	}
- 
-	public V remove(K1 key1, K2 key2) {
-		assert k1Class.isInstance(key1);
-		assert k2Class.isInstance(key2);
-
-		Map<K2,V> set = get(key1);
-		if (set == null) {
-			return null;
-		}
-		V result = set.remove(key2);
-		if (set.isEmpty())
-			remove(key1);
-		return result;
-	}
-
- 	public Iterator<Map.Entry<K2,V>> iterate(K1 key) {
- 		assert k1Class.isInstance(key);
- 		Map<K2,V> set = get(key);
-diff --git a/aQute.libg/src/aQute/lib/collections/SortedList.java b/aQute.libg/src/aQute/lib/collections/SortedList.java
-index 493d7bc..8a48a72 100644
--- a/aQute.libg/src/aQute/lib/collections/SortedList.java
-+++ b/aQute.libg/src/aQute/lib/collections/SortedList.java
-@@ -9,6 +9,7 @@ import java.util.List;
- import java.util.ListIterator;
- import java.util.NoSuchElementException;
- import java.util.SortedSet;
-+import java.util.Spliterator;
- 
- /**
-  * An immutbale list that sorts objects by their natural order or through a
-@@ -28,6 +29,11 @@ import java.util.SortedSet;
-  */
- @SuppressWarnings("unchecked")
- public class SortedList<T> implements SortedSet<T>, List<T> {
-+
-+    @Override
-+    public Spliterator<T> spliterator() {
-+        return List.super.spliterator();
-+    }
- 	static SortedList< ? >		empty		= new SortedList<Object>();
- 
- 	final T[]					list;
-diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-index efd43a3..9fd21fd 100644
--- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-@@ -217,7 +217,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.7.4
-
--- a/0002-Fix-ant-compatibility.patch
+++ b/0002-Fix-ant-compatibility.patch
@ -0,0 +1,25 @@
+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 aac8b8a..26dfe59 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.13.5
+
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@ -4,8 +4,8 @@
 %endif

 Name:           aqute-bnd
-Version:        3.3.0
-Release:        7%{?dist}
+Version:        3.4.0
+Release:        1%{?dist}
 Summary:        BND Tool
 License:        ASL 2.0
 URL:            http://bnd.bndtools.org/
@ -23,8 +23,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-Port-to-Java-8.patch
-Patch1:         0002-Disable-removed-commands.patch
+Patch0:         0001-Disable-removed-commands.patch
+Patch1:         0002-Fix-ant-compatibility.patch

 BuildRequires:  maven-local
 BuildRequires:  mvn(org.osgi:osgi.annotation)
@ -146,17 +146,25 @@ cp -p %{SOURCE4} pom.xml
 %pom_add_dep org.osgi:osgi.cmpn
 %pom_add_dep org.slf4j:slf4j-api

-%pom_add_dep org.slf4j:slf4j-simple:runtime
+%pom_add_dep org.slf4j:slf4j-simple::runtime
 popd

 # maven-plugins
-
+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
 # Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli
-%pom_disable_module bnd-indexer-maven-plugin maven
+%pom_disable_module bnd-indexer-maven-plugin
 # Requires unbuilt parts of bnd
-%pom_disable_module bnd-export-maven-plugin maven
+%pom_disable_module bnd-export-maven-plugin
+%pom_disable_module bnd-resolver-maven-plugin
+%pom_disable_module bnd-testing-maven-plugin
 # Integration tests require Internet access
-%pom_remove_plugin -r :maven-invoker-plugin maven
+%pom_remove_plugin -r :maven-invoker-plugin
+
+%pom_remove_plugin -r :flatten-maven-plugin
+popd


 %mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
@ -165,6 +173,7 @@ 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-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
@ -201,6 +210,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE

 %changelog
+* Tue Sep 12 2017 Michael Simacek <msimacek@redhat.com> - 3.4.0-1
+- Update to upstream version 3.4.0
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

--- a/parent.pom
+++ b/parent.pom
@ -188,8 +188,8 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.5.1</version>
                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                </configuration>
            </plugin>
        </plugins>
--- a/10
+++ b/10
@ -1,5 +1,5 @@
-615acce07ad7ad2f21eeda6a0177fda8  3.3.0.REL.tar.gz
-88cb0801e5da7e7c2ac35da7264ce76f  aQute.libg-3.3.0.pom
-5797cc73f65e9e2b1ca20bb4e6f83bc9  biz.aQute.bnd-3.3.0.pom
-76a08f44888a07318d4433115bb6dda2  biz.aQute.bndlib-3.3.0.pom
-acf2827baa8eb970f43777a80b2add4a  biz.aQute.bnd.annotation-3.3.0.pom
+SHA512 (3.4.0.REL.tar.gz) = 8a7d7320c45e1befa7fbe645ff1da43f5abdcc66a5010b0b3e9907679df52a43bd0f13899f8f059b857511276cebf56cb9eba844ec057f48a852a1494d5d14dd
+SHA512 (aQute.libg-3.4.0.pom) = fbf4cc72836e90aa1ef55cfb69f1f69098992e7910af6507c14b68f8bdab5d75ace88353860c8928d1c1777fb43f9038e3049572556c6a9e44eaba6d0636005e
+SHA512 (biz.aQute.bnd-3.4.0.pom) = 2687012889f102a30d4c07bc3b02b0d24d4a5c3a227caa15fc206e0f3600e408eb3cea60f4e72a598efcf3914f8052a16b6f292180f00869c4007e339dfcf974
+SHA512 (biz.aQute.bndlib-3.4.0.pom) = 07d8e8452695398ad3bc6557e42aaa58caddec50735d0befcf02bacb0f094a156d95edbdf5b4fb20c605bba1767a0cfc95e36e42d2c997f27b4887ea35f5ca12
+SHA512 (biz.aQute.bnd.annotation-3.4.0.pom) = a8c92b7172eb8c337bb3b36cedd2556a72fa6c41351d828d796bcf7b457976b7c2f630d3f2d185706095d5458207aff9c81e1f9f08bcc2aa0a350d4f968522ab