You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2013/06/01 11:33:20 UTC
[30/50] [abbrv] git commit: Upgrade to gradle 1.4 - faster and should
ease artifact publishing
Upgrade to gradle 1.4
- faster and should ease artifact publishing
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/fb559d41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/fb559d41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/fb559d41
Branch: refs/heads/master
Commit: fb559d41352b0f4a1614133c3019ce0c18f30395
Parents: 47620a5
Author: Matthieu Morel <mm...@apache.org>
Authored: Sun Mar 10 21:04:29 2013 +0100
Committer: Matthieu Morel <mm...@apache.org>
Committed: Sun Mar 10 21:04:53 2013 +0100
----------------------------------------------------------------------
build.gradle | 16 ++++++++++------
gradlew | 12 ++++++------
gradlew.bat | 2 +-
lib/gradle-wrapper-1.0.jar | Bin 39752 -> 0 bytes
lib/gradle-wrapper-1.0.properties | 6 ------
lib/gradle-wrapper-1.4.jar | Bin 0 -> 46735 bytes
lib/gradle-wrapper-1.4.properties | 6 ++++++
7 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb559d41/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 00511f9..16f73e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,10 +84,10 @@ project.ext["libraries"] = [
jcommander: 'com.beust:jcommander:1.25',
asm: 'org.ow2.asm:asm:4.0',
javax_inject: 'javax.inject:javax.inject:1',
- gradle_base_services: 'org.gradle:gradle-base-services:1.0',
- gradle_core: 'org.gradle:gradle-core:1.0',
- gradle_tooling_api: 'org.gradle:gradle-tooling-api:1.0',
- gradle_wrapper: 'gradle-wrapper:gradle-wrapper:1.0',
+ gradle_base_services: 'org.gradle:gradle-base-services:1.4',
+ gradle_core: 'org.gradle:gradle-core:1.4',
+ gradle_tooling_api: 'org.gradle:gradle-tooling-api:1.4',
+ gradle_wrapper: 'gradle-wrapper:gradle-wrapper:1.4',
metrics: 'com.yammer.metrics:metrics-core:2.1.3'
]
@@ -96,6 +96,8 @@ subprojects {
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'maven'
+ apply plugin: 'maven-publish'
+
// apply plugin: 'checkstyle'
/* Set Java version. */
@@ -169,6 +171,7 @@ subprojects {
'Implementation-Vendor-Id': 'org.apache',
'Implementation-Title': 'org.apache.s4.'+project.name.substring(3) // s4-comm becomes org.apache.s4.comm for instance
)
+
}
evaluationDependsOnChildren()
@@ -311,8 +314,8 @@ task clean << {
/* Generates the gradlew scripts.
http://www.gradle.org/docs/1.0/userguide/gradle_wrapper.html */
task wrapper(type: Wrapper) {
- gradleVersion = '1.0'
- jarFile='lib/gradle-wrapper-1.0.jar'
+ gradleVersion = '1.4'
+ jarFile='lib/gradle-wrapper-1.4.jar'
}
class Version {
@@ -325,3 +328,4 @@ class Version {
"$major.$minor.$bugfix${isRelease ? '' : '-SNAPSHOT'}-incubating"
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb559d41/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 284690e..3f041e5 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
##############################################################################
##
@@ -61,11 +61,11 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/"
+cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
-cd "$SAVED"
+cd "$SAVED" >&-
-CLASSPATH=$APP_HOME/lib/gradle-wrapper-1.0.jar
+CLASSPATH=$APP_HOME/lib/gradle-wrapper-1.4.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
@@ -101,13 +101,13 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
- warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
- JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb559d41/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
index 1816106..076e37d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -69,7 +69,7 @@ set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\lib\gradle-wrapper-1.0.jar
+set CLASSPATH=%APP_HOME%\lib\gradle-wrapper-1.4.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb559d41/lib/gradle-wrapper-1.0.jar
----------------------------------------------------------------------
diff --git a/lib/gradle-wrapper-1.0.jar b/lib/gradle-wrapper-1.0.jar
deleted file mode 100644
index ce16961..0000000
Binary files a/lib/gradle-wrapper-1.0.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb559d41/lib/gradle-wrapper-1.0.properties
----------------------------------------------------------------------
diff --git a/lib/gradle-wrapper-1.0.properties b/lib/gradle-wrapper-1.0.properties
deleted file mode 100644
index 5ee8821..0000000
--- a/lib/gradle-wrapper-1.0.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sun Jul 01 12:59:07 CEST 2012
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb559d41/lib/gradle-wrapper-1.4.jar
----------------------------------------------------------------------
diff --git a/lib/gradle-wrapper-1.4.jar b/lib/gradle-wrapper-1.4.jar
new file mode 100644
index 0000000..42d9b0e
Binary files /dev/null and b/lib/gradle-wrapper-1.4.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb559d41/lib/gradle-wrapper-1.4.properties
----------------------------------------------------------------------
diff --git a/lib/gradle-wrapper-1.4.properties b/lib/gradle-wrapper-1.4.properties
new file mode 100644
index 0000000..6bed864
--- /dev/null
+++ b/lib/gradle-wrapper-1.4.properties
@@ -0,0 +1,6 @@
+#Sun Mar 10 18:48:50 CET 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip