geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1694671 - in /geronimo/xbean/trunk: pom.xml xbean-telnet/pom.xml xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
Date Fri, 07 Aug 2015 12:39:55 GMT
Author: rmannibucau
Date: Fri Aug  7 12:39:54 2015
New Revision: 1694671

URL: http://svn.apache.org/r1694671
Log:
XBEAN-288 pathc from Emmanuel Bourg to update groovy version in telnet module, thanks Emmanuel.

Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-telnet/pom.xml
    geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=1694671&r1=1694670&r2=1694671&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Fri Aug  7 12:39:54 2015
@@ -265,9 +265,9 @@
             </dependency>
 
             <dependency>
-                <groupId>groovy</groupId>
-                <artifactId>groovy</artifactId>
-                <version>1.0-jsr-03</version>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>2.2.0</version>
             </dependency>
 
             <dependency>

Modified: geronimo/xbean/trunk/xbean-telnet/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-telnet/pom.xml?rev=1694671&r1=1694670&r2=1694671&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-telnet/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-telnet/pom.xml Fri Aug  7 12:39:54 2015
@@ -36,8 +36,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>groovy</groupId>
-            <artifactId>groovy</artifactId>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
         </dependency>
 
     </dependencies>

Modified: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java?rev=1694671&r1=1694670&r2=1694671&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
(original)
+++ geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
Fri Aug  7 12:39:54 2015
@@ -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 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"));



Mime
View raw message