You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/04/24 00:26:03 UTC

[1/2] groovy git commit: Grant read "line.separator" property permission to ScriptTest.groovy

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 146517dc8 -> 227a1db70


Grant read "line.separator" property permission to ScriptTest.groovy

(cherry picked from commit 977c91a)


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

Branch: refs/heads/GROOVY_2_6_X
Commit: 227a1db70645c9bd89450dabb1dd1ef1aec04ca6
Parents: ed77546
Author: sunlan <su...@apache.org>
Authored: Tue Apr 24 08:04:37 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Apr 24 08:25:59 2018 +0800

----------------------------------------------------------------------
 security/groovy.policy | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/227a1db7/security/groovy.policy
----------------------------------------------------------------------
diff --git a/security/groovy.policy b/security/groovy.policy
index 848de08..c688abb 100644
--- a/security/groovy.policy
+++ b/security/groovy.policy
@@ -238,6 +238,9 @@ grant codeBase "file:${user.dir}/src/test/groovy/script/ScriptTest.groovy" {
     // Required for JUnit to report errors for scripts that are junit test cases
     permission java.util.PropertyPermission "user.home", "read";
     permission java.io.FilePermission "${user.home}${/}junit.properties", "read";
+
+    // Required for Gradle 4.7+ printing a line triggered by running the script
+    permission java.util.PropertyPermission "line.separator", "read";
 };
 
 grant codeBase "file:${user.dir}/src/test/groovy/script/EvalInScript.groovy" {

[2/2] groovy git commit: Bump gradle to 4.7

Posted by su...@apache.org.
Bump gradle to 4.7


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

Branch: refs/heads/GROOVY_2_6_X
Commit: ed775463946528ebc81c01e1c70ab8ac7098cc13
Parents: 146517d
Author: sunlan <su...@apache.org>
Authored: Tue Apr 24 08:25:25 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Apr 24 08:25:59 2018 +0800

----------------------------------------------------------------------
 gradle.properties                        |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 54333 -> 54329 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/ed775463/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 9ab03c4..56af784 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ groovyVersion = 2.6.0-SNAPSHOT
 # bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits)
 groovyBundleVersion = 2.6.0.SNAPSHOT
 
-gradle_version=4.6
+gradle_version=4.7
 
 groovyJUnit_ms=512m
 groovyJUnit_mx=1g

http://git-wip-us.apache.org/repos/asf/groovy/blob/ed775463/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c44b679..f6b961f 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/groovy/blob/ed775463/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ea720f9..16d2805 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip