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/02/26 00:32:57 UTC
[1/2] groovy git commit: Add travis-ci build badge
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 9a33a4118 -> 997391831
Add travis-ci build badge
(cherry picked from commit 6952311)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/99739183
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/99739183
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/99739183
Branch: refs/heads/GROOVY_2_6_X
Commit: 9973918317d063065636727d7549549a39a5ad6d
Parents: 6bb47f5
Author: sunlan <su...@apache.org>
Authored: Mon Feb 26 08:29:47 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Mon Feb 26 08:32:52 2018 +0800
----------------------------------------------------------------------
README.adoc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/99739183/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index 0972219..cb203a7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -23,9 +23,11 @@
The Groovy development team
:revdate: 24-02-2014
:build-icon: http://ci.groovy-lang.org:8111/app/rest/builds/buildType:(id:Groovy_Jdk7Build)/statusIcon
+:travis-build-icon: https://travis-ci.org/apache/groovy.svg?branch=GROOVY_2_6_X
:noheader:
:groovy-www: http://groovy-lang.org/
:groovy-ci: http://ci.groovy-lang.org?guest=1
+:travis-ci: https://travis-ci.org/apache/groovy
:jdk: http://www.oracle.com/technetwork/java/javase/downloads
:bintray-latest-version-image: https://api.bintray.com/packages/groovy/maven/groovy/images/download.png
:bintray-latest-version-link: https://bintray.com/groovy/maven/groovy/_latestVersion
@@ -43,7 +45,8 @@ The Groovy development team
image::https://raw.githubusercontent.com/groovy/artwork/master/medium.png[]
image:{jdk-icon}[jdk, link={jdk}]
image:{apache-license-icon}[Apache License 2, link={apache-license-link}]
-image:{build-icon}[build status, link={groovy-ci}]
+image:{build-icon}[teamcity build status, link={groovy-ci}]
+image:{travis-build-icon}[travis build status, link={travis-ci}]
image:{bintray-download-icon}[bintray download, link={bintray-latest-version-link}]
image:{apache-groovy-twitter-icon}[follow on Twitter, link={apache-groovy-twitter-link}]
[2/2] groovy git commit: Bump gradle version to 4.6-rc-2
Posted by su...@apache.org.
Bump gradle version to 4.6-rc-2
I wish the latest version of gradle has solved the issue(gradle/gradle#4505)
(cherry picked from commit de85f3b)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6bb47f52
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6bb47f52
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6bb47f52
Branch: refs/heads/GROOVY_2_6_X
Commit: 6bb47f5211a1297bda18e0e03e9114a9a3f7adc5
Parents: 9a33a41
Author: sunlan <su...@apache.org>
Authored: Mon Feb 26 08:02:08 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Mon Feb 26 08:32:52 2018 +0800
----------------------------------------------------------------------
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 54333 -> 54333 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/6bb47f52/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 517111b..4d932d3 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.5.1
+gradle_version=4.6-rc-2
groovyJUnit_ms=512m
groovyJUnit_mx=1g
http://git-wip-us.apache.org/repos/asf/groovy/blob/6bb47f52/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 99340b4..c44b679 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/6bb47f52/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 568c50b..9bd94f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-rc-2-bin.zip