groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [1/3] groovy git commit: fix some serializable incompatible issues
Date Tue, 03 Apr 2018 12:43:00 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 7d9b50441 -> 588495768


fix some serializable incompatible issues


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

Branch: refs/heads/GROOVY_2_6_X
Commit: e6e7f08b9f072935dd13d2ac945d389285e766f9
Parents: 7d9b504
Author: Paul King <paulk@asert.com.au>
Authored: Tue Apr 3 20:40:31 2018 +1000
Committer: Paul King <paulk@asert.com.au>
Committed: Tue Apr 3 22:42:46 2018 +1000

----------------------------------------------------------------------
 gradle/pomconfigurer.gradle                                     | 3 +++
 src/main/groovy/groovy/lang/GroovyRuntimeException.java         | 4 +---
 src/main/groovy/groovy/lang/MissingMethodException.java         | 2 +-
 src/main/groovy/groovy/lang/MissingPropertyException.java       | 5 +----
 src/main/groovy/groovy/lang/Sequence.java                       | 4 ++--
 src/main/groovy/groovy/lang/SpreadMap.java                      | 5 +----
 src/main/groovy/groovy/util/NodeList.java                       | 5 +----
 .../groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java  | 2 --
 8 files changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/gradle/pomconfigurer.gradle
----------------------------------------------------------------------
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index d6ee1df..1ecaf40 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -556,6 +556,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
                 name 'Thibault Kruse'
             }
             contributor {
+                name 'Tim Tiemens'
+            }
+            contributor {
                 name 'Paolo Di Tommaso'
             }
             contributor {

http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/GroovyRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/GroovyRuntimeException.java b/src/main/groovy/groovy/lang/GroovyRuntimeException.java
index 00f8f96..de489c3 100644
--- a/src/main/groovy/groovy/lang/GroovyRuntimeException.java
+++ b/src/main/groovy/groovy/lang/GroovyRuntimeException.java
@@ -23,12 +23,10 @@ import org.codehaus.groovy.ast.ModuleNode;
 
 /**
  * An exception thrown by the interpreter
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
  */
 public class GroovyRuntimeException extends RuntimeException {
 
-    private static final long serialVersionUID = 3699943230572902549L;
+    private static final long serialVersionUID = -193137033604506378L;
     private ModuleNode module;
     private ASTNode node;
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/MissingMethodException.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/MissingMethodException.java b/src/main/groovy/groovy/lang/MissingMethodException.java
index b463c34..3dbaf86 100644
--- a/src/main/groovy/groovy/lang/MissingMethodException.java
+++ b/src/main/groovy/groovy/lang/MissingMethodException.java
@@ -30,7 +30,7 @@ import org.codehaus.groovy.runtime.MethodRankHelper;
 public class MissingMethodException extends GroovyRuntimeException {
 
     private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-    private static final long serialVersionUID = -2423785115382704124L;
+    private static final long serialVersionUID = -6676430495683939401L;
     private final String method;
     private final Class type;
     private final boolean isStatic;

http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/MissingPropertyException.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/MissingPropertyException.java b/src/main/groovy/groovy/lang/MissingPropertyException.java
index 552031a..273d963 100644
--- a/src/main/groovy/groovy/lang/MissingPropertyException.java
+++ b/src/main/groovy/groovy/lang/MissingPropertyException.java
@@ -20,19 +20,16 @@ package groovy.lang;
 
 import org.codehaus.groovy.runtime.MethodRankHelper;
 
-
 /**
  * An exception occurred if a dynamic property dispatch fails with an unknown property.
  * 
  * Note that the Missing*Exception classes were named for consistency and
  * to avoid conflicts with JDK exceptions of the same name.
- * 
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
  */
 public class MissingPropertyException extends GroovyRuntimeException {
 
     public static final Object MPE = new Object();
-    private static final long serialVersionUID = -5493778577329511881L;
+    private static final long serialVersionUID = -1780027060966200019L;
 
     private final String property;
     private final Class type;

http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/Sequence.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Sequence.java b/src/main/groovy/groovy/lang/Sequence.java
index 1cc6079..54f27d4 100644
--- a/src/main/groovy/groovy/lang/Sequence.java
+++ b/src/main/groovy/groovy/lang/Sequence.java
@@ -31,8 +31,8 @@ import java.util.List;
  */
 public class Sequence extends ArrayList implements GroovyObject {
 
-    private static final long serialVersionUID = 7498505573299850715L;
-    private transient groovy.lang.MetaClass metaClass = InvokerHelper.getMetaClass(getClass());
+    private static final long serialVersionUID = 5697409354934589471L;
+    private transient MetaClass metaClass = InvokerHelper.getMetaClass(getClass());
     private final Class type;
     private int hashCode;
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/SpreadMap.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/SpreadMap.java b/src/main/groovy/groovy/lang/SpreadMap.java
index b9d742b..6b3d27b 100644
--- a/src/main/groovy/groovy/lang/SpreadMap.java
+++ b/src/main/groovy/groovy/lang/SpreadMap.java
@@ -27,12 +27,9 @@ import java.util.Map;
 
 /**
  * Helper to turn a list with an even number of elements into a Map.
- * 
- * @author Pilho Kim
- * @author Tim Tiemens
  */
 public class SpreadMap extends HashMap {
-    private static final long serialVersionUID = 2870520857928038334L;
+    private static final long serialVersionUID = 3827653766235954251L;
     private int hashCode;
 
     public SpreadMap(Object[] values) {

http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/util/NodeList.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/NodeList.java b/src/main/groovy/groovy/util/NodeList.java
index 2822d9d..8ce39f4 100644
--- a/src/main/groovy/groovy/util/NodeList.java
+++ b/src/main/groovy/groovy/util/NodeList.java
@@ -33,12 +33,9 @@ import java.util.List;
 /**
  * A List implementation which is returned by queries on a {@link Node}
  * which provides some XPath like helper methods for GPath.
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- * @author Paul King
  */
 public class NodeList extends ArrayList {
-    private static final long serialVersionUID = 5454686773425258279L;
+    private static final long serialVersionUID = 8307095805417308716L;
 
     static {
         // wrap the standard MetaClass with the delegate

http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java b/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
index cb88874..d7bfae7 100644
--- a/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
+++ b/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
@@ -24,8 +24,6 @@ import java.util.Map;
 
 /**
  * Tests the SpreadMap implementation.
- *
- * @author Tim Tiemens
  */
 public class SpreadMapTest extends GroovyTestCase {
     Map map;


Mime
View raw message