You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2015/01/15 16:11:23 UTC

svn commit: r1652128 - in /felix/sandbox/pderop/dependencymanager: README gradle/ gradle/wrapper/ gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties gradlew gradlew.bat release/REAME

Author: pderop
Date: Thu Jan 15 15:11:23 2015
New Revision: 1652128

URL: http://svn.apache.org/r1652128
Log:
Added gradle wrapper

Added:
    felix/sandbox/pderop/dependencymanager/gradle/
    felix/sandbox/pderop/dependencymanager/gradle/wrapper/
    felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.jar   (with props)
    felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.properties
    felix/sandbox/pderop/dependencymanager/gradlew   (with props)
    felix/sandbox/pderop/dependencymanager/gradlew.bat
Modified:
    felix/sandbox/pderop/dependencymanager/README
    felix/sandbox/pderop/dependencymanager/release/REAME

Modified: felix/sandbox/pderop/dependencymanager/README
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/README?rev=1652128&r1=1652127&r2=1652128&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/README (original)
+++ felix/sandbox/pderop/dependencymanager/README Thu Jan 15 15:11:23 2015
@@ -27,28 +27,25 @@ Building and testing Apache Felix Depend
 ** Compilation Using gradle:
 
 - Install Jdk1.7
-- Install gradle (at least 2.1)
-- If you need to configure an http(s)proxy, then you can either edit gradle.properties and set the necessary "systemProp.http*" properties.
-
-- Alternatively, you can also specify the http/https settings using the GRADLE_OPTS environment variable. For example:
+- If necessary, configure your https proxy settings:
 
   export GRADLE_OPTS="-Dhttps.proxyHost=www.somehost.org -Dhttps.proxyPort=8080"
 
 - First, compile Dependendency Manager annotations bndtools plugin:
   
-$ gradle org.apache.felix.dependencymanager.annotation:jar
+$ ./gradlew org.apache.felix.dependencymanager.annotation:jar
 
 - Then compile all other bundles:
  
-$ gradle jar
+$ ./gradlew jar
 
 - run junit tests:
 
-$ gradle test
+$ ./gradlew test
 
 - run integration tests:
 
-$ gradle check
+$ ./gradlew check
 
 ** Compilation Using Eclipse:
 

Added: felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.jar?rev=1652128&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.properties
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.properties?rev=1652128&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.properties (added)
+++ felix/sandbox/pderop/dependencymanager/gradle/wrapper/gradle-wrapper.properties Thu Jan 15 15:11:23 2015
@@ -0,0 +1,6 @@
+#Thu Jan 15 16:04:00 CET 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip

Added: felix/sandbox/pderop/dependencymanager/gradlew
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/gradlew?rev=1652128&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager/gradlew (added)
+++ felix/sandbox/pderop/dependencymanager/gradlew Thu Jan 15 15:11:23 2015
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        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
+    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
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

Propchange: felix/sandbox/pderop/dependencymanager/gradlew
------------------------------------------------------------------------------
    svn:executable = *

Added: felix/sandbox/pderop/dependencymanager/gradlew.bat
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/gradlew.bat?rev=1652128&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager/gradlew.bat (added)
+++ felix/sandbox/pderop/dependencymanager/gradlew.bat Thu Jan 15 15:11:23 2015
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.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%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

Modified: felix/sandbox/pderop/dependencymanager/release/REAME
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/release/REAME?rev=1652128&r1=1652127&r2=1652128&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/release/REAME (original)
+++ felix/sandbox/pderop/dependencymanager/release/REAME Thu Jan 15 15:11:23 2015
@@ -6,10 +6,12 @@ Prerequisites
 
 To create a release you must:
 
-* Have Gradle (at least 2.1) installed on your system;
 * Have Subversion installed on your system;
 * Have gpg installed on your system;
 * Have a public key added to the keys file, and committed to [2] 
+* If necessary, configure your https proxy settings:
+
+  export GRADLE_OPTS="-Dhttps.proxyHost=www.somehost.org -Dhttps.proxyPort=8080"
 
 Before you can start staging a release candidate, you must:
 
@@ -30,21 +32,21 @@ svn co https://svn.apache.org/repos/asf/
 The next step is to build/test the software and create the release/staging/ directory (where the source/jars will be packaged):
 
 $ cd dependencymanager-X.Y.Z/
-$ gradle rat 
-$ gradle org.apache.felix.dependencymanager.annotation:jar (you must
-$ gradle jar
-$ gradle test
-$ gradle check
-$ gradle makeStaging (this will create ./release/staging/ directory)
+$ ./gradlew rat 
+$ ./gradlew org.apache.felix.dependencymanager.annotation:jar (you must
+$ ./gradlew jar
+$ ./gradlew test
+$ ./gradlew check
+$ ./gradlew makeStaging (this will create ./release/staging/ directory)
 
 Then you sign archives by invoking the following task:
 
-$ gradle signStaging
+$ ./gradlew signStaging
 
 you can upload the archives and the signatures to our development area, which we use to stage this release candidate. This development area can be found at 
 https://dist.apache.org/repos/dist/dev/felix and adding files to it can be done using "svnpubsub" which is taken care of by the following target:
 
-$ gradle commitToStaging
+$ ./gradlew commitToStaging
 
 Voting on the release
 =====================
@@ -68,11 +70,11 @@ Promoting the release:
 Move the artifacts from the development area to the final release location at 
 https://dist.apache.org/repos/dist/release/felix by invoking the following target:
 
-$ gradle promoteToRelease
+$ ./gradlew promoteToRelease
 
 Cancelling the release
 ======================
 
-$ gradle deleteFromStaging
+$ ./gradlew deleteFromStaging
 
 [1] http://www.apache.org/dev/release.html