groovy git commit: fix build for jdk7

[paulk]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X 7d343b1fa -> 20bfc3a62


fix build for jdk7


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

Branch: refs/heads/GROOVY_2_5_X
Commit: 20bfc3a62511da56b177e930491b1f0b75ff3e5d
Parents: 7d343b1
Author: Paul King 
Authored: Sun Aug 12 11:21:32 2018 +1000
Committer: Paul King 
Committed: Sun Aug 12 11:30:48 2018 +1000

--
 build.gradle | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/20bfc3a6/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 663c3dd..e4386e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,6 +40,7 @@ buildscript {
 classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.3.2"
 if (JavaVersion.current() >= JavaVersion.VERSION_1_8) {
 classpath 
"gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.2"
+classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0"
 }
 }
 }
@@ -47,8 +48,6 @@ buildscript {
 plugins {
 id 'com.gradle.build-scan' version '1.13.4'
 id 'me.champeau.buildscan-recipes' version '0.2.3'
-id 'com.github.spotbugs' version '1.6.2'
-id "com.github.ben-manes.versions" version '0.20.0'
 }
 
 buildScan {
@@ -71,6 +70,9 @@ ext.isReleaseVersion = 
!groovyVersion.toLowerCase().endsWith("snapshot")
 apply from: 'gradle/publish.gradle'
 apply plugin: 'javadocHotfix'
 apply plugin: "com.github.jk1.dependency-license-report"
+if (JavaVersion.current() >= JavaVersion.VERSION_1_8) {
+apply plugin: 'com.github.ben-manes.versions'
+}
 
 File javaHome = new File(System.getProperty('java.home'))
 logger.lifecycle "Using Java from $javaHome (version 
${System.getProperty('java.version')})"

groovy git commit: fix build

[paulk]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X f028da7b3 -> a5e453979


fix build


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

Branch: refs/heads/GROOVY_2_5_X
Commit: a5e4539799fa832da7fd36387fec2acd17c371ef
Parents: f028da7
Author: Paul King 
Authored: Mon Apr 16 16:34:30 2018 +1000
Committer: Paul King 
Committed: Mon Apr 16 16:34:30 2018 +1000

--
 .../java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/a5e45397/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git 
a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index e7f43c6..a9aaa7b 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -12223,7 +12223,7 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
  * @since 1.5.6
  */
 public static  Collection intersect(Collection left, 
Collection right) {
-return intersect(left, right, new NumberAwareComparator<>());
+return intersect(left, right, new NumberAwareComparator());
 }
 
 /**

groovy git commit: fix build

[paulk]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X a7e5722be -> 12c526268


fix build


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

Branch: refs/heads/GROOVY_2_6_X
Commit: 12c5262687b121fb4b31d04ab7e8a031bcbc8849
Parents: a7e5722
Author: Paul King 
Authored: Mon Apr 16 16:26:07 2018 +1000
Committer: Paul King 
Committed: Mon Apr 16 16:26:07 2018 +1000

--
 .../java/org/codehaus/groovy/control/CompilerConfiguration.java| 2 +-
 .../java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/12c52626/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
--
diff --git 
a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java 
b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index bc0cf6c..76a24e1 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -957,7 +957,7 @@ public class CompilerConfiguration {
 }
 }
 
-private ClassCodeVisitorSupport newClassCodeVisitor(SourceUnit 
source) {
+private ClassCodeVisitorSupport newClassCodeVisitor(final 
SourceUnit source) {
 return new ClassCodeVisitorSupport() {
 @Override
 public void visitClass(ClassNode node) {

http://git-wip-us.apache.org/repos/asf/groovy/blob/12c52626/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git 
a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 0902b1e..fe08a33 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -12224,7 +12224,7 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
  * @since 1.5.6
  */
 public static  Collection intersect(Collection left, 
Collection right) {
-return intersect(left, right, new NumberAwareComparator<>());
+return intersect(left, right, new NumberAwareComparator());
 }
 
 /**

groovy git commit: fix build for pre jdk8

[paulk]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X fac75d609 -> 99d3910aa


fix build for pre jdk8


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 99d3910aa49af3ca84309be585dd12e1e05010aa
Parents: fac75d6
Author: paulk 
Authored: Mon Oct 2 08:37:57 2017 +1000
Committer: paulk 
Committed: Mon Oct 2 08:41:19 2017 +1000

--
 .../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/99d3910a/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 de155a5..a9b0a0d 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -479,7 +479,7 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
 variable = (VariableExpression) vexp.getAccessedVariable();
 }
 if (variable != null) {
-ClassNode inferredType = 
getInferredTypeFromTempInfo(variable, 
variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
+ClassNode inferredType = 
getInferredTypeFromTempInfo(variable, (ClassNode) 
variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
 // instanceof applies, stash away the type, reusing key 
used elsewhere
 if (inferredType != null && 
!inferredType.getName().equals("java.lang.Object")) {
 
vexp.putNodeMetaData(StaticTypesMarker.INFERRED_RETURN_TYPE, inferredType);

groovy git commit: fix build for pre jdk8

[paulk]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X e19ee0c88 -> 4ee32d4c4


fix build for pre jdk8


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

Branch: refs/heads/GROOVY_2_5_X
Commit: 4ee32d4c49373138a65fc93e37d7cfc67d7f8b1d
Parents: e19ee0c
Author: paulk 
Authored: Mon Oct 2 08:37:57 2017 +1000
Committer: paulk 
Committed: Mon Oct 2 08:40:57 2017 +1000

--
 .../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/4ee32d4c/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 627636a..49b69b4 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -488,7 +488,7 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
 variable = (VariableExpression) vexp.getAccessedVariable();
 }
 if (variable != null) {
-ClassNode inferredType = 
getInferredTypeFromTempInfo(variable, 
variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
+ClassNode inferredType = 
getInferredTypeFromTempInfo(variable, (ClassNode) 
variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
 // instanceof applies, stash away the type, reusing key 
used elsewhere
 if (inferredType != null && 
!inferredType.getName().equals("java.lang.Object")) {
 
vexp.putNodeMetaData(StaticTypesMarker.INFERRED_RETURN_TYPE, inferredType);

groovy git commit: fix build for pre jdk8

[paulk]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X f3b2b8f62 -> d0f1c76a3


fix build for pre jdk8


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

Branch: refs/heads/GROOVY_2_6_X
Commit: d0f1c76a3f1156d49ad1a1c7850b7884d3c49582
Parents: f3b2b8f
Author: paulk 
Authored: Mon Oct 2 08:37:57 2017 +1000
Committer: paulk 
Committed: Mon Oct 2 08:37:57 2017 +1000

--
 .../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/d0f1c76a/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 015057b..e650473 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -489,7 +489,7 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
 variable = (VariableExpression) vexp.getAccessedVariable();
 }
 if (variable != null) {
-ClassNode inferredType = 
getInferredTypeFromTempInfo(variable, 
variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
+ClassNode inferredType = 
getInferredTypeFromTempInfo(variable, (ClassNode) 
variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
 // instanceof applies, stash away the type, reusing key 
used elsewhere
 if (inferredType != null && 
!inferredType.getName().equals("java.lang.Object")) {
 
vexp.putNodeMetaData(StaticTypesMarker.INFERRED_RETURN_TYPE, inferredType);