You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/08/12 06:00:32 UTC

[1/2] groovy git commit: Remove unnecessary modifiers (closes #580)

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 3c100f78b -> ead7174d9


Remove unnecessary modifiers (closes #580)

Make some minor changes to remove checkstyle issues. No major changes
have been attempted.


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ead7174d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ead7174d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ead7174d

Branch: refs/heads/GROOVY_2_6_X
Commit: ead7174d93035e79347df3c6a11553070f7febb8
Parents: 62fc3d4
Author: Harsh Gupta <ha...@hotmail.com>
Authored: Thu Aug 10 22:48:41 2017 -0700
Committer: paulk <pa...@asert.com.au>
Committed: Sat Aug 12 16:00:18 2017 +1000

----------------------------------------------------------------------
 .../groovy/macro/matcher/ContextualClassCodeVisitor.java         | 2 +-
 .../groovy/org/codehaus/groovy/macro/matcher/TreeContext.java    | 2 +-
 .../groovy/org/codehaus/groovy/macro/runtime/MacroBuilder.java   | 2 +-
 .../groovy/macro/transform/MacroClassTransformation.java         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/ead7174d/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
index a8a6bc2..e39ac05 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
@@ -595,7 +595,7 @@ public abstract class ContextualClassCodeVisitor extends ClassCodeVisitorSupport
     private static class MatchByClass implements ASTNodePredicate {
         private final Class<ASTNode> astNodeClass;
 
-        public MatchByClass(final Class<ASTNode> astNodeClass) {
+        MatchByClass(final Class<ASTNode> astNodeClass) {
             this.astNodeClass = astNodeClass;
         }
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/ead7174d/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/TreeContext.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/TreeContext.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/TreeContext.java
index 741c491..de31c8a 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/TreeContext.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/TreeContext.java
@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.Map;
 
 public class TreeContext {
-    private static enum TreeContextKey {
+    private enum TreeContextKey {
         expression_replacement
     }
     final TreeContext parent;

http://git-wip-us.apache.org/repos/asf/groovy/blob/ead7174d/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/runtime/MacroBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/runtime/MacroBuilder.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/runtime/MacroBuilder.java
index 73cb0e2..d864be1 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/runtime/MacroBuilder.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/runtime/MacroBuilder.java
@@ -61,7 +61,7 @@ public enum MacroBuilder {
         return macro(compilePhase, false, source, context, resultClass);
     }
 
-    private final static AtomicInteger COUNTER = new AtomicInteger();
+    private static final AtomicInteger COUNTER = new AtomicInteger();
 
     @SuppressWarnings("unchecked")
     public <T> T macro(CompilePhase compilePhase, boolean asIs, String source, final List<Closure<Expression>> context, Class<T> resultClass) {

http://git-wip-us.apache.org/repos/asf/groovy/blob/ead7174d/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
index 6777933..7ffc16b 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
@@ -57,7 +57,7 @@ public class MacroClassTransformation extends MethodCallTransformation {
 
         private final SourceUnit sourceUnit;
 
-        public MacroClassTransformer(SourceUnit sourceUnit) {
+        MacroClassTransformer(SourceUnit sourceUnit) {
             this.sourceUnit = sourceUnit;
         }
 
@@ -82,7 +82,7 @@ public class MacroClassTransformation extends MethodCallTransformation {
 
         private final SourceUnit sourceUnit;
 
-        public MacroClassTransformingCodeVisitor(ClassCodeExpressionTransformer transformer, SourceUnit sourceUnit) {
+        MacroClassTransformingCodeVisitor(ClassCodeExpressionTransformer transformer, SourceUnit sourceUnit) {
             super(transformer);
             this.sourceUnit = sourceUnit;
         }


[2/2] groovy git commit: bump jline version

Posted by pa...@apache.org.
bump jline version


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/62fc3d4f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/62fc3d4f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/62fc3d4f

Branch: refs/heads/GROOVY_2_6_X
Commit: 62fc3d4f991930755e52b9d04ed096ad88a7b78e
Parents: 3c100f7
Author: paulk <pa...@asert.com.au>
Authored: Sat Aug 12 14:57:08 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Sat Aug 12 16:00:18 2017 +1000

----------------------------------------------------------------------
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/62fc3d4f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 5e3069e..058b9d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -167,7 +167,7 @@ ext {
     ivyVersion = '2.4.0'
     jansiVersion = '1.13'
     jarjarVersion = '1.4.1'
-    jlineVersion = '2.14.2'
+    jlineVersion = '2.14.5'
     jmockVersion = '1.2.0'
     logbackVersion = '1.1.7'
     log4jVersion = '1.2.17'