You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/05/14 04:12:50 UTC
[1/3] incubator-groovy git commit: remove some checkstyle warnings
(merged with changes)
Repository: incubator-groovy
Updated Branches:
refs/heads/GROOVY_2_4_X aef34862d -> e9dfe8c71
remove some checkstyle warnings (merged with changes)
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/168d75fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/168d75fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/168d75fa
Branch: refs/heads/GROOVY_2_4_X
Commit: 168d75fafcce8b63c59459865e3925bca30503d1
Parents: aef3486
Author: Paul King <pa...@asert.com.au>
Authored: Sun May 10 11:43:43 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Mon May 11 08:46:10 2015 +1000
----------------------------------------------------------------------
gradle/quality.gradle | 8 +++++--
src/main/groovy/lang/ExpandoMetaClass.java | 1 -
src/main/org/codehaus/groovy/ast/ASTNode.java | 1 -
.../groovy/classgen/asm/InvocationWriter.java | 1 -
.../classgen/asm/sc/StaticInvocationWriter.java | 1 -
.../asm/sc/StaticTypesStatementWriter.java | 8 +++++--
.../groovy/runtime/ProxyGeneratorAdapter.java | 1 -
.../transform/AnnotationCollectorTransform.java | 3 +--
.../StaticCompilationTransformer.java | 24 ++++++++++++++++----
.../stc/StaticTypeCheckingVisitor.java | 1 -
.../trait/SuperCallTraitTransformer.java | 1 -
.../transform/trait/TraitASTTransformation.java | 1 -
.../codehaus/groovy/transform/trait/Traits.java | 1 -
.../org/codehaus/groovy/vmplugin/v7/Java7.java | 3 +--
14 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index 7e7c215..245bf51 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -61,8 +61,11 @@ allprojects {
configFile = file("$rootProject.projectDir/config/checkstyle/checkstyle.xml")
configProperties = ['rootProject.projectDir': rootProject.projectDir]
def reportFile = file("${buildDir}/reports/checkstyle/${name}.xml")
+ source = sourceSets.main.allJava.matching {
+ // TODO why doesn't this exclusion work?
+ exclude '**/generated-sources/**/*'
+ }
reports {
- // TODO exclude generated-sources
include ( '**/*.java')
xml {
destination reportFile
@@ -87,7 +90,8 @@ allprojects {
def xml = new XmlSlurper().parse(reportFile.newReader('utf-8'))
def files = []
xml.file.each { f ->
- if (f.error.size()) {
+ // TODO remove generated-sources check once exclude above works
+ if (f.error.size() && !f.@name.toString().contains('generated-sources')) {
files << [
name: f.@name.toString(),
errors: f.error.collect { e ->
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/groovy/lang/ExpandoMetaClass.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/ExpandoMetaClass.java b/src/main/groovy/lang/ExpandoMetaClass.java
index d0670a8..fb74414 100644
--- a/src/main/groovy/lang/ExpandoMetaClass.java
+++ b/src/main/groovy/lang/ExpandoMetaClass.java
@@ -55,7 +55,6 @@ import org.codehaus.groovy.runtime.metaclass.MixinInstanceMetaMethod;
import org.codehaus.groovy.runtime.metaclass.OwnedMetaClass;
import org.codehaus.groovy.runtime.metaclass.ThreadManagedMetaBeanProperty;
import org.codehaus.groovy.util.FastArray;
-import org.objectweb.asm.Opcodes;
/**
* ExpandoMetaClass is a MetaClass that behaves like an Expando, allowing the addition or replacement
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/ast/ASTNode.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/ast/ASTNode.java b/src/main/org/codehaus/groovy/ast/ASTNode.java
index 887c8e8..3dc9691 100644
--- a/src/main/org/codehaus/groovy/ast/ASTNode.java
+++ b/src/main/org/codehaus/groovy/ast/ASTNode.java
@@ -22,7 +22,6 @@ import org.codehaus.groovy.GroovyBugError;
import org.codehaus.groovy.util.ListHashMap;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
index 9be85f1..321a5e7 100644
--- a/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
+++ b/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
@@ -36,7 +36,6 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
import org.codehaus.groovy.syntax.SyntaxException;
-import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
index 21cc48b..fe50d75 100644
--- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
+++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
@@ -28,7 +28,6 @@ import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.expr.*;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.ast.stmt.ForStatement;
-import org.codehaus.groovy.ast.tools.WideningCategories;
import org.codehaus.groovy.classgen.AsmClassGenerator;
import org.codehaus.groovy.classgen.Verifier;
import org.codehaus.groovy.classgen.asm.*;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java
index bb7d8b6..470793d 100644
--- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java
+++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java
@@ -27,13 +27,17 @@ import org.codehaus.groovy.ast.expr.MethodCallExpression;
import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ForStatement;
import org.codehaus.groovy.classgen.AsmClassGenerator;
-import org.codehaus.groovy.classgen.asm.*;
+import org.codehaus.groovy.classgen.asm.BytecodeVariable;
+import org.codehaus.groovy.classgen.asm.CompileStack;
+import org.codehaus.groovy.classgen.asm.MethodCaller;
+import org.codehaus.groovy.classgen.asm.OperandStack;
+import org.codehaus.groovy.classgen.asm.StatementWriter;
+import org.codehaus.groovy.classgen.asm.TypeChooser;
import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import java.util.Enumeration;
-import java.util.Iterator;
import static org.objectweb.asm.Opcodes.*;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
index 463c44e..df53393 100644
--- a/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
+++ b/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
@@ -24,7 +24,6 @@ import groovy.lang.GroovyClassLoader;
import groovy.lang.GroovyObject;
import groovy.lang.GroovyRuntimeException;
import groovy.transform.Trait;
-import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.classgen.asm.BytecodeHelper;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java b/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java
index d392206..20067ce 100644
--- a/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java
+++ b/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java
@@ -28,7 +28,6 @@ import org.codehaus.groovy.ast.*;
import org.codehaus.groovy.ast.expr.*;
import org.codehaus.groovy.ast.stmt.ReturnStatement;
import org.codehaus.groovy.ast.stmt.Statement;
-import org.codehaus.groovy.control.CompilationUnit;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.control.messages.SyntaxErrorMessage;
import org.codehaus.groovy.syntax.SyntaxException;
@@ -57,7 +56,7 @@ public class AnnotationCollectorTransform {
}
/**
- * Class used by {@link CompilationUnit} to transform the alias class
+ * Class used by {@link org.codehaus.groovy.control.CompilationUnit} to transform the alias class
* into what is needed by the compiler. This means removing invalid
* modifiers, interfaces and superclasses, as well as adding a static
* value method returning our serialized version of the data for processing
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java
index f84697e..67e5bea 100644
--- a/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java
+++ b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java
@@ -18,17 +18,33 @@
*/
package org.codehaus.groovy.transform.sc.transformers;
-import org.codehaus.groovy.ast.*;
-import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.ClassCodeExpressionTransformer;
+import org.codehaus.groovy.ast.ClassHelper;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.InnerClassNode;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.expr.BinaryExpression;
+import org.codehaus.groovy.ast.expr.BooleanExpression;
+import org.codehaus.groovy.ast.expr.CastExpression;
+import org.codehaus.groovy.ast.expr.ClosureExpression;
+import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.ListExpression;
+import org.codehaus.groovy.ast.expr.MethodCallExpression;
+import org.codehaus.groovy.ast.expr.RangeExpression;
+import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
+import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.ast.stmt.Statement;
import org.codehaus.groovy.classgen.asm.sc.StaticTypesTypeChooser;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
import org.codehaus.groovy.syntax.Types;
-import org.codehaus.groovy.transform.sc.StaticCompilationVisitor;
import org.codehaus.groovy.transform.stc.StaticTypeCheckingVisitor;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
* Some expressions use symbols as aliases to method calls (<<, +=, ...). In static compilation,
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index f856da4..b492aa3 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -22,7 +22,6 @@ import groovy.lang.Closure;
import groovy.lang.DelegatesTo;
import groovy.lang.IntRange;
import groovy.lang.Range;
-import groovy.transform.SelfType;
import groovy.transform.TypeChecked;
import groovy.transform.TypeCheckingMode;
import groovy.transform.stc.ClosureParams;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java b/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
index bc07cb6..cfa9c0c 100644
--- a/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
+++ b/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
@@ -33,7 +33,6 @@ import org.codehaus.groovy.ast.expr.TupleExpression;
import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.syntax.Types;
-import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
index 0da8140..028d943 100644
--- a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
+++ b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
@@ -58,7 +58,6 @@ import org.codehaus.groovy.syntax.Types;
import org.codehaus.groovy.transform.ASTTransformationCollectorCodeVisitor;
import org.codehaus.groovy.transform.AbstractASTTransformation;
import org.codehaus.groovy.transform.GroovyASTTransformation;
-import org.codehaus.groovy.transform.sc.StaticCompileTransformation;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/transform/trait/Traits.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/trait/Traits.java b/src/main/org/codehaus/groovy/transform/trait/Traits.java
index 26f8a4b..a5d3a46 100644
--- a/src/main/org/codehaus/groovy/transform/trait/Traits.java
+++ b/src/main/org/codehaus/groovy/transform/trait/Traits.java
@@ -34,7 +34,6 @@ import org.codehaus.groovy.ast.expr.ListExpression;
import org.codehaus.groovy.ast.tools.GenericsUtils;
import org.codehaus.groovy.classgen.asm.BytecodeHelper;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
-import org.codehaus.groovy.transform.stc.Receiver;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/168d75fa/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java b/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java
index 51a5673..3ec9279 100644
--- a/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java
+++ b/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java
@@ -24,7 +24,6 @@ import org.codehaus.groovy.vmplugin.v6.Java6;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -37,7 +36,7 @@ import java.security.PrivilegedAction;
* @author Jochen Theodorou
*/
public class Java7 extends Java6 {
- private final static Constructor<MethodHandles.Lookup> LOOKUP_Constructor;
+ private static final Constructor<MethodHandles.Lookup> LOOKUP_Constructor;
static {
Constructor<MethodHandles.Lookup> con = null;
try {
[2/3] incubator-groovy git commit: draft doco for groovy commandline
Posted by pa...@apache.org.
draft doco for groovy commandline
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/654b2c1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/654b2c1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/654b2c1a
Branch: refs/heads/GROOVY_2_4_X
Commit: 654b2c1a7122a271c44fbd44598c41695cf8462d
Parents: 168d75f
Author: Paul King <pa...@asert.com.au>
Authored: Thu May 14 11:12:15 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 14 12:12:33 2015 +1000
----------------------------------------------------------------------
src/spec/doc/index.adoc | 2 ++
src/spec/doc/tools-groovy.adoc | 41 +++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/654b2c1a/src/spec/doc/index.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/index.adoc b/src/spec/doc/index.adoc
index fef4556..4a6b70b 100644
--- a/src/spec/doc/index.adoc
+++ b/src/spec/doc/index.adoc
@@ -20,6 +20,8 @@ include::{projectdir}/src/spec/doc/core-semantics.adoc[leveloffset=+2]
== Tools
+include::{projectdir}/src/spec/doc/tools-groovy.adoc[leveloffset=+2]
+
include::{projectdir}/src/spec/doc/tools-groovyc.adoc[leveloffset=+2]
include::{projectdir}/subprojects/groovy-groovysh/{specfolder}/groovysh.adoc[leveloffset=+2]
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/654b2c1a/src/spec/doc/tools-groovy.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/tools-groovy.adoc b/src/spec/doc/tools-groovy.adoc
new file mode 100644
index 0000000..a13487b
--- /dev/null
+++ b/src/spec/doc/tools-groovy.adoc
@@ -0,0 +1,41 @@
+= Running Groovy from the commandline
+
+[[section-groovy-commandline]]
+== groovy, the Groovy command
+
+`groovy` invokes the Groovy command line processor. It allows you to run inline Groovy expressions, and scripts, tests or application within groovy files.
+It plays a similar role to `java` in the Java world but handles inline scripts and rather than invoking class files, it is normally called with scripts
+and will automatically call the Groovy compiler as needed.
+
+The easiest way to run a Groovy script, test or application is to run the following command at your shell prompt:
+
+------------------------
+> groovy MyScript.groovy
+------------------------
+
+The `.groovy` part is optional. The `groovy` command supports a number of command line switches:
+
+[cols="<,<,<,<",options="header,footer"]
+|=======================================================================
+|Short version |Long version |Description |Example
+| -a | --autosplit <splitPattern> | split lines using splitPattern (default '\s') using implicit 'split' variable |
+| -b | --basescript <class> | Base class name for scripts (must derive from Script) |
+| -c | --encoding <charset> | specify the encoding of the files |
+| -cp <path> | -classpath <path> +
+--classpath <path> | Specify the compilation classpath. Must be the first argument. | groovy -cp lib/dep.jar MyScript
+| | --configscript <path> | Advanced compiler configuration script | groovy --configscript config/config.groovy src/Person.groovy
+| -D | --define <name=value> | define a system property |
+| -d | --debug | debug mode will print out full stack traces |
+| | --disableopt <optlist> | disables one or all optimization elements. +
+optlist can be a comma separated list with the elements: +
+all (disables all optimizations), +
+int (disable any int based optimizations) |
+| -e <script> | | specify an inline command line script | groovy -e "println new Date()"
+| -h | --help | Displays usage information for the command line groovy command | groovy --help
+| -i <extension> | | modify files in place; create backup if extension is given (e.g. '.bak') |
+| | --indy | Enables invokedynamic support. Requires Java 7+ | groovy --indy Person.groovy
+| -l <port> | | listen on a port and process inbound lines (default: 1960) |
+| -n | | process files line by line using implicit 'line' variable |
+| -p | | process files line by line and print result (see also -n) |
+| -v | --version | display the Groovy and JVM versions | groovy -v
+|=======================================================================
[3/3] incubator-groovy git commit: fix build
Posted by pa...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/e9dfe8c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/e9dfe8c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/e9dfe8c7
Branch: refs/heads/GROOVY_2_4_X
Commit: e9dfe8c716522974fee99441b0c502cc816691b2
Parents: 654b2c1
Author: Paul King <pa...@asert.com.au>
Authored: Thu May 14 12:05:55 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 14 12:12:34 2015 +1000
----------------------------------------------------------------------
src/test/groovy/grape/GrabResolverTest.groovy | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e9dfe8c7/src/test/groovy/grape/GrabResolverTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/grape/GrabResolverTest.groovy b/src/test/groovy/grape/GrabResolverTest.groovy
index 9eda0ff..be7e0eb 100644
--- a/src/test/groovy/grape/GrabResolverTest.groovy
+++ b/src/test/groovy/grape/GrabResolverTest.groovy
@@ -49,7 +49,11 @@ class GrabResolverTest extends GroovyTestCase {
Grape.@instance = null // isolate our test from other tests
}
- public void testChecksumsCanBeDisabled() {
+ public void manualTestChecksumsCanBeDisabled() {
+ // TODO someone has cleaned up the checksum info in the public repos that this test
+ // was relying on and so this test no longer fails unless you have the corrupt SHA1
+ // value cached in your local grapes repo, change test to not rely on that fact and
+ // then reinstate (use a local file repo?)
GroovyShell shell = new GroovyShell(new GroovyClassLoader())
shouldFail(RuntimeException) {
shell.evaluate """