[aqute-bndlib] Port to Java 8
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Fri Nov 21 13:54:23 UTC 2014
commit 2485e20391e8d576b4ab89d9bfcaff5d113ea901
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Nov 21 14:52:48 2014 +0100
Port to Java 8
- Resolves: rhbz#1105966
0001-Port-to-Java-8.patch | 84 +++++++++++++++++++++++++++++++++++++++++++++
aqute-bndlib.spec | 12 +++++-
2 files changed, 94 insertions(+), 2 deletions(-)
---
diff --git a/0001-Port-to-Java-8.patch b/0001-Port-to-Java-8.patch
new file mode 100644
index 0000000..f8ae1dd
--- /dev/null
+++ b/0001-Port-to-Java-8.patch
@@ -0,0 +1,84 @@
+From 2141ae5d6ba0c2bd95b12189a150a0f0ab32864e Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Fri, 21 Nov 2014 14:51:51 +0100
+Subject: [PATCH] Port to Java 8
+
+---
+ src/main/java/aQute/bnd/signing/Signer.java | 4 ++--
+ src/main/java/aQute/lib/collections/MultiMap.java | 2 +-
+ src/main/java/aQute/lib/osgi/Analyzer.java | 4 ++--
+ src/main/java/aQute/lib/osgi/Jar.java | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/main/java/aQute/bnd/signing/Signer.java b/src/main/java/aQute/bnd/signing/Signer.java
+index bed91be..d3af5ef 100644
+--- a/src/main/java/aQute/bnd/signing/Signer.java
++++ b/src/main/java/aQute/bnd/signing/Signer.java
+@@ -119,7 +119,7 @@ public class Signer extends Processor {
+ if (algorithms[a] != null) {
+ byte[] digest = algorithms[a].digest(manbytes);
+ ps.print(digestNames[a] + "-Digest-Manifest: ");
+- ps.print(new Base64(digest));
++ ps.print(new aQute.lib.base64.Base64(digest));
+ ps.print("\r\n");
+ }
+ }
+@@ -142,7 +142,7 @@ public class Signer extends Processor {
+ if (algorithms[a] != null) {
+ byte[] digest = algorithms[a].digest();
+ String header = digestNames[a] + "-Digest: "
+- + new Base64(digest) + "\r\n";
++ + new aQute.lib.base64.Base64(digest) + "\r\n";
+ out.write(header.getBytes());
+ }
+ }
+diff --git a/src/main/java/aQute/lib/collections/MultiMap.java b/src/main/java/aQute/lib/collections/MultiMap.java
+index 7672638..e5ccb7c 100644
+--- a/src/main/java/aQute/lib/collections/MultiMap.java
++++ b/src/main/java/aQute/lib/collections/MultiMap.java
+@@ -24,7 +24,7 @@ public class MultiMap<K,V> extends HashMap<K,Set<V>> {
+ return set.addAll(value);
+ }
+
+- public boolean remove( K key, V value ) {
++ public boolean remove( Object key, Object value ) {
+ Set<V> set = get(key);
+ if ( set == null) {
+ return false;
+diff --git a/src/main/java/aQute/lib/osgi/Analyzer.java b/src/main/java/aQute/lib/osgi/Analyzer.java
+index 957269a..ee7291f 100644
+--- a/src/main/java/aQute/lib/osgi/Analyzer.java
++++ b/src/main/java/aQute/lib/osgi/Analyzer.java
+@@ -2278,7 +2278,7 @@ public class Analyzer extends Processor {
+ if (hex)
+ return Hex.toHexString(digester.digest().digest());
+ else
+- return Base64.encodeBase64(digester.digest().digest());
++ return aQute.lib.base64.Base64.encodeBase64(digester.digest().digest());
+ }
+
+ /**
+@@ -2296,6 +2296,6 @@ public class Analyzer extends Processor {
+ throw new FileNotFoundException("From sha1, not found " + args[1]);
+
+ IO.copy(r.openInputStream(), digester);
+- return Base64.encodeBase64(digester.digest().digest());
++ return aQute.lib.base64.Base64.encodeBase64(digester.digest().digest());
+ }
+ }
+diff --git a/src/main/java/aQute/lib/osgi/Jar.java b/src/main/java/aQute/lib/osgi/Jar.java
+index c8b2359..8f1f98c 100644
+--- a/src/main/java/aQute/lib/osgi/Jar.java
++++ b/src/main/java/aQute/lib/osgi/Jar.java
+@@ -624,7 +624,7 @@ public class Jar implements Closeable {
+ in.close();
+ }
+ for (MessageDigest d : digests)
+- attributes.putValue(d.getAlgorithm() + "-Digest", Base64.encodeBase64(d.digest()));
++ attributes.putValue(d.getAlgorithm() + "-Digest", aQute.lib.base64.Base64.encodeBase64(d.digest()));
+ }
+ }
+
+--
+1.9.3
+
diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec
index e854237..7fed8cc 100644
--- a/aqute-bndlib.spec
+++ b/aqute-bndlib.spec
@@ -1,13 +1,15 @@
Name: aqute-bndlib
Version: 1.50.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: BND Library
License: ASL 2.0
URL: http://www.aQute.biz/Code/Bnd
+BuildArch: noarch
+
Source0: http://repo1.maven.org/maven2/biz/aQute/bndlib/1.50.0/bndlib-1.50.0.jar
Source1: http://repo1.maven.org/maven2/biz/aQute/bndlib/1.50.0/bndlib-1.50.0.pom
-BuildArch: noarch
+Patch0: 0001-Port-to-Java-8.patch
BuildRequires: java-devel
BuildRequires: maven-local
@@ -38,6 +40,8 @@ API documentation for %{name}.
mkdir -p src/main/java target/classes
mv -f OSGI-OPT/src/* src/main/java/
+%patch0 -p1
+
# removing bundled classess & junk
rm -rf OSGI-OPT
rm -rf META-INF
@@ -70,6 +74,10 @@ export LC_ALL=en_US.UTF-8
%doc LICENSE
%changelog
+* Fri Nov 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.50.0-10
+- Port to Java 8
+- Resolves: rhbz#1105966
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.50.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list