[libxbean-java] 02/03: Transition to Groovy 2 (Closes: #733099)

[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 5630d461a537c1739519cb4e517e5e6b241c2ad5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 7 16:24:41 2015 +0200

    Transition to Groovy 2 (Closes: #733099)
---
 debian/changelog                           |  1 +
 debian/control                             |  4 ++--
 debian/maven.rules                         |  2 +-
 debian/patches/bootstrap.series            |  1 +
 debian/patches/full.series                 |  1 +
 debian/patches/groovy2-compatibility.patch | 21 +++++++++++++++++++++
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c293b6..e049596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxbean-java (4.3-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed a ClassNotFoundException in AsmParameterNameLoader (Closes: #789518)
+  * Transition to Groovy 2 (Closes: #733099)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 07 Aug 2015 13:06:30 +0200
 
diff --git a/debian/control b/debian/control
index 3d4e403..e48643b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
 Build-Depends-Indep:
  ant,
  ant-optional,
- groovy (>= 1.8.6-4~),
+ groovy2,
  junit4,
  libasm4-java,
  libcglib3-java,
@@ -54,7 +54,7 @@ Recommends:
  libcommons-logging-java,
  liblog4j1.2-java
 Suggests:
- groovy,
+ groovy2,
  libequinox-osgi-java,
  libosgi-compendium-java,
  libosgi-core-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index ff85ded..b466c6e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,9 +22,9 @@ log4j log4j jar s/1\.2\..*/1.2.x/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
 org.ow2.asm * * s/.*/4.x/ * *
-s/groovy/org.codehaus.groovy/ groovy* * s/.*/1.x/ * *
 org.springframework * * s/.*/3.x/ * *
 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/ * *
diff --git a/debian/patches/bootstrap.series b/debian/patches/bootstrap.series
index ae7e6d1..cfb3bab 100644
--- a/debian/patches/bootstrap.series
+++ b/debian/patches/bootstrap.series
@@ -3,3 +3,4 @@ bundle.diff
 modules.diff
 DelegatingBundleContext.patch
 fix-asm-visitor.patch
+groovy2-compatibility.patch
diff --git a/debian/patches/full.series b/debian/patches/full.series
index 6ec746c..1bff0e6 100644
--- a/debian/patches/full.series
+++ b/debian/patches/full.series
@@ -2,3 +2,4 @@ bundle.diff
 modules.diff
 DelegatingBundleContext.patch
 fix-asm-visitor.patch
+groovy2-compatibility.patch
diff --git a/debian/patches/groovy2-compatibility.patch b/debian/patches/groovy2-compatibility.patch
new file mode 100644
index 0000000..e63c343
--- /dev/null
+++ b/debian/patches/groovy2-compatibility.patch
@@ -0,0 +1,21 @@
+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