From 0a918edcaf89446fa383bcec21b1fe0c458d0444 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Apr 10 2015 13:31:32 +0000 Subject: Add support for InvokeDynamic constant pool entry --- diff --git a/0001-Port-to-Java-8.patch b/0001-Port-to-Java-8.patch index f8ae1dd..b36e7c8 100644 --- a/0001-Port-to-Java-8.patch +++ b/0001-Port-to-Java-8.patch @@ -1,4 +1,4 @@ -From 2141ae5d6ba0c2bd95b12189a150a0f0ab32864e Mon Sep 17 00:00:00 2001 +From 34a42ce72fc9a640a59c26dd3ec6eed4b7115e59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 21 Nov 2014 14:51:51 +0100 Subject: [PATCH] Port to Java 8 @@ -7,8 +7,9 @@ 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/Clazz.java | 6 ++++++ src/main/java/aQute/lib/osgi/Jar.java | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + 5 files changed, 12 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 @@ -66,6 +67,23 @@ index 957269a..ee7291f 100644 + return aQute.lib.base64.Base64.encodeBase64(digester.digest().digest()); } } +diff --git a/src/main/java/aQute/lib/osgi/Clazz.java b/src/main/java/aQute/lib/osgi/Clazz.java +index cb5e1f0..e70b079 100644 +--- a/src/main/java/aQute/lib/osgi/Clazz.java ++++ b/src/main/java/aQute/lib/osgi/Clazz.java +@@ -311,6 +311,12 @@ public class Clazz { + 4, // 10 CONSTANT_MethodRef + 4, // 11 CONSTANT_InterfaceMethodRef + 4, // 12 CONSTANT_NameAndType ++ -1, // 13 Not defined ++ -1, // 14 Not defined ++ 3, // 15 CONSTANT_MethodHandle ++ 2, // 16 CONSTANT_MethodType ++ -1, // 17 Not defined ++ 4, // 18 CONSTANT_InvokeDynamic + }; + + boolean isAbstract; 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 @@ -80,5 +98,5 @@ index c8b2359..8f1f98c 100644 } -- -1.9.3 +2.1.0 diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec index 7fed8cc..da13645 100644 --- a/aqute-bndlib.spec +++ b/aqute-bndlib.spec @@ -1,6 +1,6 @@ Name: aqute-bndlib Version: 1.50.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: BND Library License: ASL 2.0 URL: http://www.aQute.biz/Code/Bnd @@ -74,6 +74,9 @@ export LC_ALL=en_US.UTF-8 %doc LICENSE %changelog +* Fri Apr 10 2015 Mikolaj Izdebski - 1.50.0-11 +- Add support for InvokeDynamic constant pool entry + * Fri Nov 21 2014 Mikolaj Izdebski - 1.50.0-10 - Port to Java 8 - Resolves: rhbz#1105966