You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2015/07/12 00:24:23 UTC
[1/2] incubator-groovy git commit: update wrapper artifacts to match
gradle.version
Repository: incubator-groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 013915ab0 -> a536f19a7
update wrapper artifacts to match gradle.version
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/6740cd34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/6740cd34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/6740cd34
Branch: refs/heads/GROOVY_2_4_X
Commit: 6740cd3422364b2e53eeb132d565bfb9107dd7af
Parents: d4bb210
Author: paulk <pa...@asert.com.au>
Authored: Sun Jul 12 08:23:06 2015 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Sun Jul 12 08:23:06 2015 +1000
----------------------------------------------------------------------
gradle/wrapper/gradle-wrapper.jar | Bin 50527 -> 51018 bytes
gradle/wrapper/gradle-wrapper.properties | 19 ++-----------------
2 files changed, 2 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/6740cd34/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0569213..c97a8bd 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/6740cd34/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f37df84..d5e3af8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,21 +1,6 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#Thu Apr 10 09:16:15 EST 2014
+#Sun Jul 12 08:22:22 AEST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
[2/2] incubator-groovy git commit: Merge branch 'GROOVY_2_4_X' of
http://git-wip-us.apache.org/repos/asf/incubator-groovy into GROOVY_2_4_X
Posted by pa...@apache.org.
Merge branch 'GROOVY_2_4_X' of http://git-wip-us.apache.org/repos/asf/incubator-groovy into GROOVY_2_4_X
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/a536f19a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/a536f19a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/a536f19a
Branch: refs/heads/GROOVY_2_4_X
Commit: a536f19a7e294591ee41b075ece05013f9c17d52
Parents: 6740cd3 013915a
Author: paulk <pa...@asert.com.au>
Authored: Sun Jul 12 08:23:54 2015 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Sun Jul 12 08:23:54 2015 +1000
----------------------------------------------------------------------
gradle.properties | 19 +--------
gradle/test.gradle | 16 ++-----
src/main/groovy/lang/EmptyRange.java | 2 +-
src/main/groovy/lang/MetaClassImpl.java | 2 +-
.../groovy/classgen/AsmClassGenerator.java | 2 +-
.../org/codehaus/groovy/classgen/Verifier.java | 13 +++---
.../groovy/runtime/DefaultGroovyMethods.java | 4 +-
.../codehaus/groovy/runtime/MethodClosure.java | 11 ++++-
.../metaclass/ConcurrentReaderHashMap.java | 4 +-
.../StaticCompilationTransformer.java | 2 +-
.../stc/StaticTypeCheckingSupport.java | 8 ++--
.../stc/StaticTypeCheckingVisitor.java | 2 +-
.../org/codehaus/groovy/vmplugin/VMPlugin.java | 2 +-
src/spec/test/gdk/WorkingWithIOSpecTest.groovy | 2 +-
.../gls/invocation/CovariantReturnTest.groovy | 45 ++++++++++++++++++++
src/test/groovy/bugs/Groovy4393Bug.groovy | 3 ++
src/test/groovy/bugs/Groovy965_Bug.groovy | 19 ++-------
src/test/groovy/bugs/TestSupport.java | 2 +
.../groovy/security/RunOneGroovyScript.java | 13 +-----
src/test/groovy/security/SecurityTest.java | 10 +----
.../groovy/security/SecurityTestSupport.java | 2 +
.../codehaus/groovy/ast/LineColumnChecker.java | 2 +
.../groovy/classgen/DummyTestDerivation.java | 31 --------------
.../codehaus/groovy/classgen/TestSupport.java | 2 +
.../asm/sc/Groovy7222OptimizationsTest.groovy | 2 +-
.../src/main/java/groovy/sql/Sql.java | 2 +-
.../groovy/groovy/swing/impl/TableLayout.java | 2 +-
.../groovy/text/GStringTemplateEngine.java | 10 +++--
.../groovy/text/SimpleTemplateEngine.java | 2 +-
.../groovy/text/StreamingTemplateEngine.java | 4 +-
.../main/java/groovy/util/GroovyTestCase.java | 2 +-
.../main/java/groovy/util/XmlNodePrinter.java | 2 +-
.../src/main/java/groovy/xml/MarkupBuilder.java | 2 +-
33 files changed, 116 insertions(+), 130 deletions(-)
----------------------------------------------------------------------