From 7103c99bd97f40d5282c1701b30e23fea11d8a60 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 21 Nov 2014 11:43:56 +0100
Subject: [PATCH 4/4] Port to Groovy 2.3.7

---
 pom.xml                                                           | 4 ++--
 xbean-telnet/pom.xml                                              | 2 +-
 xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 36bb2da..e483eb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,9 +245,9 @@
             </dependency>
 
             <dependency>
-                <groupId>groovy</groupId>
+                <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy</artifactId>
-                <version>1.0-jsr-03</version>
+                <version>2.3.7</version>
             </dependency>
 
             <dependency>
diff --git a/xbean-telnet/pom.xml b/xbean-telnet/pom.xml
index 1f26170..f6db40e 100644
--- a/xbean-telnet/pom.xml
+++ b/xbean-telnet/pom.xml
@@ -36,7 +36,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>groovy</groupId>
+            <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
 
diff --git a/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java b/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
index 2ccb8eb..b7208fe 100755
--- 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,8 @@
 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 +35,7 @@ public class GroovySh implements Command {
     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"));
-- 
2.1.0