You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2015/06/13 18:03:03 UTC

[1/2] incubator-groovy git commit: Do not use JDK internal version of Opcodes

Repository: incubator-groovy
Updated Branches:
  refs/heads/master 33fcc5661 -> c1c75d854


Do not use JDK internal version of Opcodes


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

Branch: refs/heads/master
Commit: c1c75d854f40acc5d83f6bb1b7f18ed4d13d418d
Parents: 83d6808
Author: Cedric Champeau <cc...@apache.org>
Authored: Sat Jun 13 17:56:45 2015 +0200
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sat Jun 13 18:02:47 2015 +0200

----------------------------------------------------------------------
 .../groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/c1c75d85/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy
index bf54f78..12c0d43 100644
--- a/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy
+++ b/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy
@@ -18,7 +18,6 @@
  */
 package org.codehaus.groovy.classgen.asm.sc
 
-import com.sun.xml.internal.ws.org.objectweb.asm.Opcodes
 import groovy.transform.stc.StaticTypeCheckingTestCase
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
@@ -32,6 +31,7 @@ import org.codehaus.groovy.syntax.Token
 import org.codehaus.groovy.syntax.Types
 import org.codehaus.groovy.transform.sc.StaticCompilationVisitor
 import org.codehaus.groovy.transform.sc.transformers.StaticCompilationTransformer
+import org.objectweb.asm.Opcodes
 
 class Groovy7222OptimizationsTest extends StaticTypeCheckingTestCase implements StaticCompilationTestSupport  {
     void testShouldOptimizeConstantInitialization() {

Re: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect generic type arguments

Posted by Benedikt Ritter <br...@apache.org>.
Thank you for the clarification!

2015-06-13 18:20 GMT+02:00 Cédric Champeau <ce...@gmail.com>:

> Yes, because Gradle 2.4 doesn't support JDK 9.
>
> 2015-06-13 18:17 GMT+02:00 Benedikt Ritter <br...@apache.org>:
>
>> Hello,
>>
>> has the change to gradle-wrapper.properties been made intentionally?
>>
>> Benedikt
>>
>> ---------- Forwarded message ----------
>> From: <cc...@apache.org>
>> Date: 2015-06-13 18:03 GMT+02:00
>> Subject: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect
>> generic type arguments
>> To: commits@groovy.incubator.apache.org
>>
>>
>> Fixes for JDK 9 : incorrect generic type arguments
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/83d68087
>> Tree:
>> http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/83d68087
>> Diff:
>> http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/83d68087
>>
>> Branch: refs/heads/master
>> Commit: 83d680877c44072c46bdf2212303398ac3b1276e
>> Parents: 33fcc56
>> Author: Cedric Champeau <cc...@apache.org>
>> Authored: Sat Jun 13 17:52:10 2015 +0200
>> Committer: Cedric Champeau <cc...@apache.org>
>> Committed: Sat Jun 13 18:02:47 2015 +0200
>>
>> ----------------------------------------------------------------------
>>  gradle/wrapper/gradle-wrapper.properties                  |  2 +-
>>  .../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 10 +++++-----
>>  2 files changed, 6 insertions(+), 6 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/gradle/wrapper/gradle-wrapper.properties
>> ----------------------------------------------------------------------
>> diff --git a/gradle/wrapper/gradle-wrapper.properties
>> b/gradle/wrapper/gradle-wrapper.properties
>> index f7f7322..d61b8d8 100644
>> --- a/gradle/wrapper/gradle-wrapper.properties
>> +++ b/gradle/wrapper/gradle-wrapper.properties
>> @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
>>  distributionPath=wrapper/dists
>>  zipStoreBase=GRADLE_USER_HOME
>>  zipStorePath=wrapper/dists
>> -distributionUrl=https\://
>> services.gradle.org/distributions/gradle-2.4-bin.zip
>> +distributionUrl=
>> http://services.gradle.org/distributions-snapshots/gradle-2.6-20150612220026+0000-bin.zip
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
>> b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
>> index d7e799d..db7f6ce 100644
>> --- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
>> +++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
>> @@ -7490,7 +7490,7 @@ public class DefaultGroovyMethods extends
>> DefaultGroovyMethodsSupport {
>>       * @see java.util.Collections#unmodifiableMap(java.util.Map)
>>       * @since 1.0
>>       */
>> -    public static <K,V> Map<K,V> asImmutable(Map<? extends K, ? extends
>> V> self) {
>> +    public static <K,V> Map<K,V> asImmutable(Map<K,V> self) {
>>          return Collections.unmodifiableMap(self);
>>      }
>>
>> @@ -7502,7 +7502,7 @@ public class DefaultGroovyMethods extends
>> DefaultGroovyMethodsSupport {
>>       * @see
>> java.util.Collections#unmodifiableSortedMap(java.util.SortedMap)
>>       * @since 1.0
>>       */
>> -    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K, ?
>> extends V> self) {
>> +    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K,V> self) {
>>          return Collections.unmodifiableSortedMap(self);
>>      }
>>
>> @@ -7514,7 +7514,7 @@ public class DefaultGroovyMethods extends
>> DefaultGroovyMethodsSupport {
>>       * @see java.util.Collections#unmodifiableList(java.util.List)
>>       * @since 1.0
>>       */
>> -    public static <T> List<T> asImmutable(List<? extends T> self) {
>> +    public static <T> List<T> asImmutable(List<T> self) {
>>          return Collections.unmodifiableList(self);
>>      }
>>
>> @@ -7526,7 +7526,7 @@ public class DefaultGroovyMethods extends
>> DefaultGroovyMethodsSupport {
>>       * @see java.util.Collections#unmodifiableSet(java.util.Set)
>>       * @since 1.0
>>       */
>> -    public static <T> Set<T> asImmutable(Set<? extends T> self) {
>> +    public static <T> Set<T> asImmutable(Set<T> self) {
>>          return Collections.unmodifiableSet(self);
>>      }
>>
>> @@ -7559,7 +7559,7 @@ public class DefaultGroovyMethods extends
>> DefaultGroovyMethodsSupport {
>>       * @see
>> java.util.Collections#unmodifiableCollection(java.util.Collection)
>>       * @since 1.5.0
>>       */
>> -    public static <T> Collection<T> asImmutable(Collection<? extends T>
>> self) {
>> +    public static <T> Collection<T> asImmutable(Collection<T> self) {
>>          return Collections.unmodifiableCollection(self);
>>      }
>>
>>
>>
>>
>>
>> --
>> http://people.apache.org/~britter/
>> http://www.systemoutprintln.de/
>> http://twitter.com/BenediktRitter
>> http://github.com/britter
>>
>
>


-- 
http://people.apache.org/~britter/
http://www.systemoutprintln.de/
http://twitter.com/BenediktRitter
http://github.com/britter

Re: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect generic type arguments

Posted by Cédric Champeau <ce...@gmail.com>.
Yes, because Gradle 2.4 doesn't support JDK 9.

2015-06-13 18:17 GMT+02:00 Benedikt Ritter <br...@apache.org>:

> Hello,
>
> has the change to gradle-wrapper.properties been made intentionally?
>
> Benedikt
>
> ---------- Forwarded message ----------
> From: <cc...@apache.org>
> Date: 2015-06-13 18:03 GMT+02:00
> Subject: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect
> generic type arguments
> To: commits@groovy.incubator.apache.org
>
>
> Fixes for JDK 9 : incorrect generic type arguments
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/83d68087
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/83d68087
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/83d68087
>
> Branch: refs/heads/master
> Commit: 83d680877c44072c46bdf2212303398ac3b1276e
> Parents: 33fcc56
> Author: Cedric Champeau <cc...@apache.org>
> Authored: Sat Jun 13 17:52:10 2015 +0200
> Committer: Cedric Champeau <cc...@apache.org>
> Committed: Sat Jun 13 18:02:47 2015 +0200
>
> ----------------------------------------------------------------------
>  gradle/wrapper/gradle-wrapper.properties                  |  2 +-
>  .../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/gradle/wrapper/gradle-wrapper.properties
> ----------------------------------------------------------------------
> diff --git a/gradle/wrapper/gradle-wrapper.properties
> b/gradle/wrapper/gradle-wrapper.properties
> index f7f7322..d61b8d8 100644
> --- a/gradle/wrapper/gradle-wrapper.properties
> +++ b/gradle/wrapper/gradle-wrapper.properties
> @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
>  distributionPath=wrapper/dists
>  zipStoreBase=GRADLE_USER_HOME
>  zipStorePath=wrapper/dists
> -distributionUrl=https\://
> services.gradle.org/distributions/gradle-2.4-bin.zip
> +distributionUrl=
> http://services.gradle.org/distributions-snapshots/gradle-2.6-20150612220026+0000-bin.zip
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> ----------------------------------------------------------------------
> diff --git
> a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> index d7e799d..db7f6ce 100644
> --- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> +++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> @@ -7490,7 +7490,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see java.util.Collections#unmodifiableMap(java.util.Map)
>       * @since 1.0
>       */
> -    public static <K,V> Map<K,V> asImmutable(Map<? extends K, ? extends
> V> self) {
> +    public static <K,V> Map<K,V> asImmutable(Map<K,V> self) {
>          return Collections.unmodifiableMap(self);
>      }
>
> @@ -7502,7 +7502,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see
> java.util.Collections#unmodifiableSortedMap(java.util.SortedMap)
>       * @since 1.0
>       */
> -    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K, ? extends
> V> self) {
> +    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K,V> self) {
>          return Collections.unmodifiableSortedMap(self);
>      }
>
> @@ -7514,7 +7514,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see java.util.Collections#unmodifiableList(java.util.List)
>       * @since 1.0
>       */
> -    public static <T> List<T> asImmutable(List<? extends T> self) {
> +    public static <T> List<T> asImmutable(List<T> self) {
>          return Collections.unmodifiableList(self);
>      }
>
> @@ -7526,7 +7526,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see java.util.Collections#unmodifiableSet(java.util.Set)
>       * @since 1.0
>       */
> -    public static <T> Set<T> asImmutable(Set<? extends T> self) {
> +    public static <T> Set<T> asImmutable(Set<T> self) {
>          return Collections.unmodifiableSet(self);
>      }
>
> @@ -7559,7 +7559,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see
> java.util.Collections#unmodifiableCollection(java.util.Collection)
>       * @since 1.5.0
>       */
> -    public static <T> Collection<T> asImmutable(Collection<? extends T>
> self) {
> +    public static <T> Collection<T> asImmutable(Collection<T> self) {
>          return Collections.unmodifiableCollection(self);
>      }
>
>
>
>
>
> --
> http://people.apache.org/~britter/
> http://www.systemoutprintln.de/
> http://twitter.com/BenediktRitter
> http://github.com/britter
>

Fwd: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect generic type arguments

Posted by Benedikt Ritter <br...@apache.org>.
Hello,

has the change to gradle-wrapper.properties been made intentionally?

Benedikt

---------- Forwarded message ----------
From: <cc...@apache.org>
Date: 2015-06-13 18:03 GMT+02:00
Subject: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect
generic type arguments
To: commits@groovy.incubator.apache.org


Fixes for JDK 9 : incorrect generic type arguments


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

Branch: refs/heads/master
Commit: 83d680877c44072c46bdf2212303398ac3b1276e
Parents: 33fcc56
Author: Cedric Champeau <cc...@apache.org>
Authored: Sat Jun 13 17:52:10 2015 +0200
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sat Jun 13 18:02:47 2015 +0200

----------------------------------------------------------------------
 gradle/wrapper/gradle-wrapper.properties                  |  2 +-
 .../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index f7f7322..d61b8d8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://
services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=
http://services.gradle.org/distributions-snapshots/gradle-2.6-20150612220026+0000-bin.zip


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index d7e799d..db7f6ce 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -7490,7 +7490,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableMap(java.util.Map)
      * @since 1.0
      */
-    public static <K,V> Map<K,V> asImmutable(Map<? extends K, ? extends V>
self) {
+    public static <K,V> Map<K,V> asImmutable(Map<K,V> self) {
         return Collections.unmodifiableMap(self);
     }

@@ -7502,7 +7502,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
      * @see
java.util.Collections#unmodifiableSortedMap(java.util.SortedMap)
      * @since 1.0
      */
-    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K, ? extends
V> self) {
+    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K,V> self) {
         return Collections.unmodifiableSortedMap(self);
     }

@@ -7514,7 +7514,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableList(java.util.List)
      * @since 1.0
      */
-    public static <T> List<T> asImmutable(List<? extends T> self) {
+    public static <T> List<T> asImmutable(List<T> self) {
         return Collections.unmodifiableList(self);
     }

@@ -7526,7 +7526,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableSet(java.util.Set)
      * @since 1.0
      */
-    public static <T> Set<T> asImmutable(Set<? extends T> self) {
+    public static <T> Set<T> asImmutable(Set<T> self) {
         return Collections.unmodifiableSet(self);
     }

@@ -7559,7 +7559,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
      * @see
java.util.Collections#unmodifiableCollection(java.util.Collection)
      * @since 1.5.0
      */
-    public static <T> Collection<T> asImmutable(Collection<? extends T>
self) {
+    public static <T> Collection<T> asImmutable(Collection<T> self) {
         return Collections.unmodifiableCollection(self);
     }





-- 
http://people.apache.org/~britter/
http://www.systemoutprintln.de/
http://twitter.com/BenediktRitter
http://github.com/britter

[2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect generic type arguments

Posted by cc...@apache.org.
Fixes for JDK 9 : incorrect generic type arguments


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

Branch: refs/heads/master
Commit: 83d680877c44072c46bdf2212303398ac3b1276e
Parents: 33fcc56
Author: Cedric Champeau <cc...@apache.org>
Authored: Sat Jun 13 17:52:10 2015 +0200
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sat Jun 13 18:02:47 2015 +0200

----------------------------------------------------------------------
 gradle/wrapper/gradle-wrapper.properties                  |  2 +-
 .../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f7f7322..d61b8d8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=http://services.gradle.org/distributions-snapshots/gradle-2.6-20150612220026+0000-bin.zip

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index d7e799d..db7f6ce 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -7490,7 +7490,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableMap(java.util.Map)
      * @since 1.0
      */
-    public static <K,V> Map<K,V> asImmutable(Map<? extends K, ? extends V> self) {
+    public static <K,V> Map<K,V> asImmutable(Map<K,V> self) {
         return Collections.unmodifiableMap(self);
     }
 
@@ -7502,7 +7502,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableSortedMap(java.util.SortedMap)
      * @since 1.0
      */
-    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K, ? extends V> self) {
+    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K,V> self) {
         return Collections.unmodifiableSortedMap(self);
     }
 
@@ -7514,7 +7514,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableList(java.util.List)
      * @since 1.0
      */
-    public static <T> List<T> asImmutable(List<? extends T> self) {
+    public static <T> List<T> asImmutable(List<T> self) {
         return Collections.unmodifiableList(self);
     }
 
@@ -7526,7 +7526,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableSet(java.util.Set)
      * @since 1.0
      */
-    public static <T> Set<T> asImmutable(Set<? extends T> self) {
+    public static <T> Set<T> asImmutable(Set<T> self) {
         return Collections.unmodifiableSet(self);
     }
 
@@ -7559,7 +7559,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
      * @see java.util.Collections#unmodifiableCollection(java.util.Collection)
      * @since 1.5.0
      */
-    public static <T> Collection<T> asImmutable(Collection<? extends T> self) {
+    public static <T> Collection<T> asImmutable(Collection<T> self) {
         return Collections.unmodifiableCollection(self);
     }