[libxbean-java] 03/04: Removed the Groovy and ASM patches (fixed upstream)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libxbean-java.

commit 5a6503ef0900c940f6f30aeeec7c765a949bb0d3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 5 09:13:01 2015 +0200

    Removed the Groovy and ASM patches (fixed upstream)
---
 debian/changelog                           |  4 ++-
 debian/maven.rules                         |  2 +-
 debian/patches/bootstrap.series            |  2 --
 debian/patches/fix-asm-visitor.patch       | 41 ------------------------------
 debian/patches/full.series                 |  2 --
 debian/patches/groovy2-compatibility.patch | 21 ---------------
 6 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ee9a7e..5134cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-libxbean-java (4.3-3) UNRELEASED; urgency=medium
+libxbean-java (4.4-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Removed the Groovy and ASM patches (fixed upstream)
   * Removed the HTML view of the source files from the javadoc
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 05 Oct 2015 09:07:44 +0200
diff --git a/debian/maven.rules b/debian/maven.rules
index b466c6e..4573bb5 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -27,4 +27,4 @@ s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
 s/org.apache.commons/commons-jexl/ commons-jexl jar s/.*/debian/ * *
 s/org.eclipse/org.eclipse.osgi/ s/osgi/org.eclipse.osgi * s/.*/debian/ * *
 cglib cglib-nodep * s/.*/3.x/ * *
-s/groovy/org.codehaus.groovy/ s/groovy/groovy-all/ * s/.*/2.x/ * *
+org.codehaus.groovy groovy-all * s/.*/2.x/ * *
diff --git a/debian/patches/bootstrap.series b/debian/patches/bootstrap.series
index cfb3bab..093e9f7 100644
--- a/debian/patches/bootstrap.series
+++ b/debian/patches/bootstrap.series
@@ -2,5 +2,3 @@ bootstrap.diff
 bundle.diff
 modules.diff
 DelegatingBundleContext.patch
-fix-asm-visitor.patch
-groovy2-compatibility.patch
diff --git a/debian/patches/fix-asm-visitor.patch b/debian/patches/fix-asm-visitor.patch
deleted file mode 100644
index 20bd09a..0000000
--- a/debian/patches/fix-asm-visitor.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Replace EmptyVisitor with ClassVisitor in AsmParameterNameLoader to fix a ClassNotFoundException
-Author: Emmanuel Bourg <ebourg at apache.org>
-Bug: https://github.com/apache/geronimo-xbean/pull/12
-Bug-Debian: https://bugs.debian.org/789518
---- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
-+++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
-@@ -17,8 +17,8 @@
-  */
- package org.apache.xbean.recipe;
- 
--import org.apache.xbean.asm5.original.commons.EmptyVisitor;
- import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassVisitor;
- import org.objectweb.asm.Label;
- import org.objectweb.asm.MethodVisitor;
- import org.objectweb.asm.Opcodes;
-@@ -211,7 +211,7 @@
-         }
-     }
- 
--    private static class AllParameterNamesDiscoveringVisitor extends EmptyVisitor {
-+    private static class AllParameterNamesDiscoveringVisitor extends ClassVisitor {
-         private final Map<Constructor,List<String>> constructorParameters = new HashMap<Constructor,List<String>>();
-         private final Map<Method,List<String>> methodParameters = new HashMap<Method,List<String>>();
-         private final Map<String,Exception> exceptions = new HashMap<String,Exception>();
-@@ -220,6 +220,7 @@
-         private final Map<String,Constructor> constructorMap = new HashMap<String,Constructor>();
- 
-         public AllParameterNamesDiscoveringVisitor(Class type, String methodName) {
-+            super(Opcodes.ASM5);
-             this.methodName = methodName;
- 
-             List<Method> methods = new ArrayList<Method>(Arrays.asList(type.getMethods()));
-@@ -232,6 +233,7 @@
-         }
- 
-         public AllParameterNamesDiscoveringVisitor(Class type) {
-+            super(Opcodes.ASM5);
-             this.methodName = "<init>";
- 
-             List<Constructor> constructors = new ArrayList<Constructor>(Arrays.asList(type.getConstructors()));
diff --git a/debian/patches/full.series b/debian/patches/full.series
index ee9aec2..bcb3209 100644
--- a/debian/patches/full.series
+++ b/debian/patches/full.series
@@ -1,6 +1,4 @@
 bundle.diff
 modules.diff
 DelegatingBundleContext.patch
-fix-asm-visitor.patch
-groovy2-compatibility.patch
 disable-javadoc-linksource.patch
diff --git a/debian/patches/groovy2-compatibility.patch b/debian/patches/groovy2-compatibility.patch
deleted file mode 100644
index e63c343..0000000
--- a/debian/patches/groovy2-compatibility.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fixes the compatibility with Groovy 2
-Origin: backport, https://svn.apache.org/r1694671
---- a/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
-+++ b/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
-@@ -17,6 +17,7 @@
- package org.apache.xbean.command;
- 
- import groovy.lang.GroovyShell;
-+import groovy.lang.GroovySystem;
- import org.codehaus.groovy.runtime.InvokerHelper;
- 
- import java.io.BufferedReader;
-@@ -33,7 +34,7 @@
-     public int main(String[] args, InputStream in, PrintStream out) {
-         GroovyShell shell = new GroovyShell();
-         BufferedReader reader = new BufferedReader(new InputStreamReader(in));
--        String version = InvokerHelper.getVersion();
-+        String version = GroovySystem.getVersion();
-         out.println("Lets get Groovy!");
-         out.println("================");
-         out.println("Version: " + version + " JVM: " + System.getProperty("java.vm.version"));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxbean-java.git