Return-Path: X-Original-To: apmail-groovy-dev-archive@minotaur.apache.org Delivered-To: apmail-groovy-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7AE7E17960 for ; Sat, 13 Jun 2015 16:21:12 +0000 (UTC) Received: (qmail 16800 invoked by uid 500); 13 Jun 2015 16:21:12 -0000 Delivered-To: apmail-groovy-dev-archive@groovy.apache.org Received: (qmail 16761 invoked by uid 500); 13 Jun 2015 16:21:12 -0000 Mailing-List: contact dev-help@groovy.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.incubator.apache.org Delivered-To: mailing list dev@groovy.incubator.apache.org Received: (qmail 16751 invoked by uid 99); 13 Jun 2015 16:21:12 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Jun 2015 16:21:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 224B7CD966 for ; Sat, 13 Jun 2015 16:21:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.9 X-Spam-Level: ** X-Spam-Status: No, score=2.9 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=3, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id Grkg_IQbHUEt for ; Sat, 13 Jun 2015 16:21:01 +0000 (UTC) Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTPS id 8790343BAB for ; Sat, 13 Jun 2015 16:21:00 +0000 (UTC) Received: by wgv5 with SMTP id 5so41429214wgv.1 for ; Sat, 13 Jun 2015 09:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=sVgo3cjNlUpDHeoJbK7VAcyb5Tou3taWXtr2Ze5yBRM=; b=OXP1ucM+hgvMbOZhTwkU8JCGk7cSrkJzbAVi2XDDPBqtQzZfbjsedUMKvqhRXpMF+8 iQN706FostkUrLlFbwaSgbAniW7Rzzh03BE4OKX6PFRkWHuDXAV+FlwPZIB2gpHutnX8 roEGBgNIsEyu1Ui+nZvnLFH7FvdlHmk18jLuy0y+9LzqToi1yy6ADfteifLZAx7/5gbX x6L7McQV/MlmN9BGI+7f9O3RdHXJwOa64wxWvn7bYt/5px0qMEEaL7vkmgZt19bWQQHy e7KcS5lGZl9R2vt20ltCySgfYFKQgycEGs6KQP9LpQqmyAOIaZgNRtQQOXpODHWSANl3 TAUA== MIME-Version: 1.0 X-Received: by 10.180.106.73 with SMTP id gs9mr16479478wib.1.1434212409352; Sat, 13 Jun 2015 09:20:09 -0700 (PDT) Received: by 10.180.216.105 with HTTP; Sat, 13 Jun 2015 09:20:09 -0700 (PDT) In-Reply-To: References: <664234303dfe46b699bd926f8fd5a59b@git.apache.org> <517b99464cae411c8d2b31d14c814c54@git.apache.org> Date: Sat, 13 Jun 2015 18:20:09 +0200 Message-ID: Subject: Re: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect generic type arguments From: =?UTF-8?Q?C=C3=A9dric_Champeau?= To: dev@groovy.incubator.apache.org Content-Type: multipart/alternative; boundary=f46d04428fce3125b1051868998f --f46d04428fce3125b1051868998f Content-Type: text/plain; charset=UTF-8 Yes, because Gradle 2.4 doesn't support JDK 9. 2015-06-13 18:17 GMT+02:00 Benedikt Ritter : > Hello, > > has the change to gradle-wrapper.properties been made intentionally? > > Benedikt > > ---------- Forwarded message ---------- > From: > 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 > Authored: Sat Jun 13 17:52:10 2015 +0200 > Committer: Cedric Champeau > 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 Map asImmutable(Map V> self) { > + public static Map asImmutable(Map 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 SortedMap asImmutable(SortedMap V> self) { > + public static SortedMap asImmutable(SortedMap 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 List asImmutable(List self) { > + public static List asImmutable(List 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 Set asImmutable(Set self) { > + public static Set asImmutable(Set 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 Collection asImmutable(Collection > self) { > + public static Collection asImmutable(Collection self) { > return Collections.unmodifiableCollection(self); > } > > > > > > -- > http://people.apache.org/~britter/ > http://www.systemoutprintln.de/ > http://twitter.com/BenediktRitter > http://github.com/britter > --f46d04428fce3125b1051868998f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Yes, because Gradle 2.4 doesn't support JDK 9.

2015-06-13 18:1= 7 GMT+02:00 Benedikt Ritter <britter@apache.org>:
Hello,

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

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


Fixes for JDK 9 : incorrect generic typ= e arguments


Project: http://git-wip-us.apache.org/re= pos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apa= che.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 <cchampeau@apache.org>
Authored: Sat Jun 13 17:52:10 2015 +0200
Committer: Cedric Champeau <cchampeau@apache.org>
Committed: Sat Jun 13 18:02:47 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83= d68087/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/grad= le-wrapper.properties
index f7f7322..d61b8d8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,4 +18,4 @@ distributionBase=3DGRADLE_USER_HOME
=C2=A0distributionPath=3Dwrapper/dists
=C2=A0zipStoreBase=3DGRADLE_USER_HOME
=C2=A0zipStorePath=3Dwrapper/dists
-distributionUrl=3Dhttps\://services.grad= le.org/distributions/gradle-2.4-bin.zip
+distributionUrl=3Dhttp://services.gradle.org/distributions-snapshots/gradle-2.6-20150= 612220026+0000-bin.zip


http://git-wip-us.apache.org/repos/asf/in= cubator-groovy/blob/83d68087/src/main/org/codehaus/groovy/runtime/DefaultGr= oovyMethods.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 DefaultGroo= vyMethodsSupport {
=C2=A0 =C2=A0 =C2=A0 * @see java.util.Collections#unmodifiableMap(java.util= .Map)
=C2=A0 =C2=A0 =C2=A0 * @since 1.0
=C2=A0 =C2=A0 =C2=A0 */
-=C2=A0 =C2=A0 public static <K,V> Map<K,V> asImmutable(Map<= ? extends K, ? extends V> self) {
+=C2=A0 =C2=A0 public static <K,V> Map<K,V> asImmutable(Map<= K,V> self) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return Collections.unmodifiableMap(self);=
=C2=A0 =C2=A0 =C2=A0}

@@ -7502,7 +7502,7 @@ public class DefaultGroovyMethods extends DefaultGroo= vyMethodsSupport {
=C2=A0 =C2=A0 =C2=A0 * @see java.util.Collections#unmodifiableSortedMap(jav= a.util.SortedMap)
=C2=A0 =C2=A0 =C2=A0 * @since 1.0
=C2=A0 =C2=A0 =C2=A0 */
-=C2=A0 =C2=A0 public static <K,V> SortedMap<K,V> asImmutable(S= ortedMap<K, ? extends V> self) {
+=C2=A0 =C2=A0 public static <K,V> SortedMap<K,V> asImmutable(S= ortedMap<K,V> self) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return Collections.unmodifiableSortedMap(= self);
=C2=A0 =C2=A0 =C2=A0}

@@ -7514,7 +7514,7 @@ public class DefaultGroovyMethods extends DefaultGroo= vyMethodsSupport {
=C2=A0 =C2=A0 =C2=A0 * @see java.util.Collections#unmodifiableList(java.uti= l.List)
=C2=A0 =C2=A0 =C2=A0 * @since 1.0
=C2=A0 =C2=A0 =C2=A0 */
-=C2=A0 =C2=A0 public static <T> List<T> asImmutable(List<? = extends T> self) {
+=C2=A0 =C2=A0 public static <T> List<T> asImmutable(List<T&= gt; self) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return Collections.unmodifiableList(self)= ;
=C2=A0 =C2=A0 =C2=A0}

@@ -7526,7 +7526,7 @@ public class DefaultGroovyMethods extends DefaultGroo= vyMethodsSupport {
=C2=A0 =C2=A0 =C2=A0 * @see java.util.Collections#unmodifiableSet(java.util= .Set)
=C2=A0 =C2=A0 =C2=A0 * @since 1.0
=C2=A0 =C2=A0 =C2=A0 */
-=C2=A0 =C2=A0 public static <T> Set<T> asImmutable(Set<? ex= tends T> self) {
+=C2=A0 =C2=A0 public static <T> Set<T> asImmutable(Set<T>= ; self) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return Collections.unmodifiableSet(self);=
=C2=A0 =C2=A0 =C2=A0}

@@ -7559,7 +7559,7 @@ public class DefaultGroovyMethods extends DefaultGroo= vyMethodsSupport {
=C2=A0 =C2=A0 =C2=A0 * @see java.util.Collections#unmodifiableCollection(ja= va.util.Collection)
=C2=A0 =C2=A0 =C2=A0 * @since 1.5.0
=C2=A0 =C2=A0 =C2=A0 */
-=C2=A0 =C2=A0 public static <T> Collection<T> asImmutable(Coll= ection<? extends T> self) {
+=C2=A0 =C2=A0 public static <T> Collection<T> asImmutable(Coll= ection<T> self) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return Collections.unmodifiableCollection= (self);
=C2=A0 =C2=A0 =C2=A0}





--

--f46d04428fce3125b1051868998f--