groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blackd...@apache.org
Subject groovy git commit: miner fixes for jdk9 and adaption to differing source level from master
Date Mon, 03 Oct 2016 16:46:17 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X ce957cdd6 -> f7dfd258b


miner fixes for jdk9 and adaption to differing source level from master


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

Branch: refs/heads/GROOVY_2_4_X
Commit: f7dfd258b62111de911a47d81b0ca5063e081a36
Parents: ce957cd
Author: Jochen Theodorou <blackdrag@gmx.org>
Authored: Mon Oct 3 18:45:37 2016 +0200
Committer: Jochen Theodorou <blackdrag@gmx.org>
Committed: Mon Oct 3 18:45:37 2016 +0200

----------------------------------------------------------------------
 src/main/org/codehaus/groovy/reflection/CachedClass.java           | 2 +-
 .../groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/f7dfd258/src/main/org/codehaus/groovy/reflection/CachedClass.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/reflection/CachedClass.java b/src/main/org/codehaus/groovy/reflection/CachedClass.java
index 1674294..f0a57e9 100644
--- a/src/main/org/codehaus/groovy/reflection/CachedClass.java
+++ b/src/main/org/codehaus/groovy/reflection/CachedClass.java
@@ -86,7 +86,7 @@ public class CachedClass {
         } catch (Throwable outer) {
             // swallow for strict security managers, module systems, android or others,
             // but try one-by-one to get the allowed ones at least
-            final ArrayList<AccessibleObject> ret = new ArrayList<>(aoa.length);
+            final ArrayList<AccessibleObject> ret = new ArrayList<AccessibleObject>(aoa.length);
             for (final AccessibleObject ao : aoa) {
                 try {
                     ao.setAccessible(true);

http://git-wip-us.apache.org/repos/asf/groovy/blob/f7dfd258/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
index fdda30f..f60cc70 100644
--- a/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
+++ b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
@@ -70,7 +70,7 @@ public class ExtensionModuleHelperForTests {
                                 }
                             }
                             if (jdk9) {
-                                jvmarg(value: '-addmods')
+                                jvmarg(value: '--add-modules')
                                 jvmarg(value: 'java.xml.bind')
                             }
                         }


Mime
View raw message