From 6ed23744fcf1e15378e053d0e328eeb794eec2f7 Mon Sep 17 00:00:00 2001 From: kimchy Date: Fri, 2 Apr 2010 15:47:27 +0300 Subject: [PATCH] upgrade to gradle 0.9 preview 1 --- build.gradle | 50 +++-- gradle/gradle-wrapper.jar | Bin 10725 -> 10719 bytes gradle/gradle-wrapper.properties | 4 +- gradlew | 12 +- gradlew.bat | 251 +++++++++++++------------- modules/benchmark/micro/build.gradle | 8 +- modules/elasticsearch/build.gradle | 10 +- modules/test/integration/build.gradle | 12 +- modules/test/testng/build.gradle | 4 +- plugins/attachments/build.gradle | 23 +-- 10 files changed, 189 insertions(+), 185 deletions(-) diff --git a/build.gradle b/build.gradle index a8a07bb083b..ffb05236a79 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import java.text.SimpleDateFormat defaultTasks "clean", "release" -usePlugin BasePlugin +apply plugin: 'base' archivesBaseName = 'elasticsearch' @@ -69,32 +69,44 @@ task explodedDist(dependsOn: [configurations.distLib], description: 'Builds a mi ant.chmod(dir: "$explodedDistDir/bin", perm: "ugo+rx", includes: "**/*") } -task zip(type: Zip) { - dependsOn explodedDist -// classifier = 'all' -} - -zip.doFirst {task -> +task zip(type: Zip, dependsOn: ['explodedDist']) { zipRootFolder = "$archivesBaseName-${-> version}" - task.configure { - zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) { - exclude 'bin/*' - } - zipFileSet(dir: explodedDistDir, prefix: zipRootFolder, fileMode: '775') { - include 'bin/*' - exclude 'bin/*.*' - } - zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) { - include 'bin/*.*' - } + from(explodedDistDir) { + into zipRootFolder + exclude 'bin/*' + } + from(explodedDistDir) { + into zipRootFolder + include 'bin/*' + exclude 'bin/*.*' + fileMode: '775' + } + from(explodedDistDir) { + into zipRootFolder + include 'bin/*.*' } } +//zip.doFirst {task -> +// task.configure { +// zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) { +// exclude 'bin/*' +// } +// zipFileSet(dir: explodedDistDir, prefix: zipRootFolder, fileMode: '775') { +// include 'bin/*' +// exclude 'bin/*.*' +// } +// zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) { +// include 'bin/*.*' +// } +// } +//} +// task release(dependsOn: [zip, ":plugins-attachments:release"]) << { ant.delete(dir: explodedDistDir) } task wrapper(type: Wrapper) { - gradleVersion = '0.8' + gradleVersion = '0.9-preview-1' jarPath = 'gradle' } diff --git a/gradle/gradle-wrapper.jar b/gradle/gradle-wrapper.jar index 66d374e9635a710148fabb0dd7012fd078fffd9e..7907a585461261632a05b8ac9144f369e60a3033 100644 GIT binary patch delta 5620 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 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul -if not errorlevel 1 goto init - -echo. -echo ERROR: JAVA_HOME might be 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 if there are problems. -echo. - -:init -@rem get name of script to launch with full path -@rem Get command-line arguments, handling Windowz variants -SET _marker=%JAVA_HOME: =% -@rem IF NOT "%_marker%" == "%JAVA_HOME%" ECHO JAVA_HOME "%JAVA_HOME%" contains spaces. Please change to a location without spaces if this causes problems. - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%eval[2+2]" == "4" goto 4NT_args - -IF "%_marker%" == "%JAVA_HOME%" goto :win9xME_args - -set _FIXPATH= -call :fixpath "%JAVA_HOME%" -set JAVA_HOME=%_FIXPATH:~1% - -goto win9xME_args - -:fixpath -if not %1.==. ( -for /f "tokens=1* delims=;" %%a in (%1) do ( -call :shortfilename "%%a" & call :fixpath "%%b" -) -) -goto :EOF -:shortfilename -for %%i in (%1) do set _FIXPATH=%_FIXPATH%;%%~fsi -goto :EOF - - -: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 STARTER_MAIN_CLASS=org.gradle.wrapper.WrapperMain -set CLASSPATH=%DIRNAME%\gradle\gradle-wrapper.jar -set WRAPPER_PROPERTIES=%DIRNAME%\gradle\gradle-wrapper.properties -set JAVA_EXE=%JAVA_HOME%\bin\java.exe -set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar - -set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dtools.jar="%TOOLS_JAR%" -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%" - -"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1 - -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 "%ERRORLEVEL%" -exit /b "%ERRORLEVEL%" - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem ## +@rem Gradle startup script for Windows ## +@rem ## +@rem ########################################################################## + +@rem +@rem $Revision: 10602 $ $Date: 2008-01-25 02:49:54 +0100 (ven., 25 janv. 2008) $ +@rem + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together. +set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m +@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=.\ + +@rem Determine the command interpreter to execute the "CD" later +set COMMAND_COM="cmd.exe" +if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe" +if exist "%SystemRoot%\command.com" set COMMAND_COM="%SystemRoot%\command.com" + +@rem Use explicit find.exe to prevent cygwin and others find.exe from being used +set FIND_EXE="find.exe" +if exist "%SystemRoot%\system32\find.exe" set FIND_EXE="%SystemRoot%\system32\find.exe" +if exist "%SystemRoot%\command\find.exe" set FIND_EXE="%SystemRoot%\command\find.exe" + +:check_JAVA_HOME +@rem Make sure we have a valid JAVA_HOME +if not "%JAVA_HOME%" == "" goto have_JAVA_HOME + +echo. +echo ERROR: Environment variable JAVA_HOME has not been set. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. +echo. +goto end + +:have_JAVA_HOME +@rem Validate JAVA_HOME +%COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul +if not errorlevel 1 goto init + +echo. +echo ERROR: JAVA_HOME might be 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 if there are problems. +echo. + +:init +@rem get name of script to launch with full path +@rem Get command-line arguments, handling Windowz variants +SET _marker=%JAVA_HOME: =% +@rem IF NOT "%_marker%" == "%JAVA_HOME%" ECHO JAVA_HOME "%JAVA_HOME%" contains spaces. Please change to a location without spaces if this causes problems. + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%eval[2+2]" == "4" goto 4NT_args + +IF "%_marker%" == "%JAVA_HOME%" goto :win9xME_args + +set _FIXPATH= +call :fixpath "%JAVA_HOME%" +set JAVA_HOME=%_FIXPATH:~1% + +goto win9xME_args + +:fixpath +if not %1.==. ( +for /f "tokens=1* delims=;" %%a in (%1) do ( +call :shortfilename "%%a" & call :fixpath "%%b" +) +) +goto :EOF +:shortfilename +for %%i in (%1) do set _FIXPATH=%_FIXPATH%;%%~fsi +goto :EOF + + +: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 STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain +set CLASSPATH=%DIRNAME%\gradle\gradle-wrapper.jar +set WRAPPER_PROPERTIES=%DIRNAME%\gradle\gradle-wrapper.properties +set JAVA_EXE=%JAVA_HOME%\bin\java.exe + +set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%" + +"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1 + +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 "%ERRORLEVEL%" +exit /b "%ERRORLEVEL%" + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + :omega \ No newline at end of file diff --git a/modules/benchmark/micro/build.gradle b/modules/benchmark/micro/build.gradle index 9aa6af68737..201a192239c 100644 --- a/modules/benchmark/micro/build.gradle +++ b/modules/benchmark/micro/build.gradle @@ -1,6 +1,6 @@ dependsOn(':elasticsearch') -usePlugin 'java' +apply plugin: 'java' archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" @@ -20,7 +20,7 @@ dependencies { test { useTestNG() - options.suiteName = project.name - options.listeners = ["org.elasticsearch.util.testng.Listeners"] - options.systemProperties = ["es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties")] + suiteName = project.name + listeners = ["org.elasticsearch.util.testng.Listeners"] + systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties") } diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle index d99ccc09787..f9ea7ed3628 100644 --- a/modules/elasticsearch/build.gradle +++ b/modules/elasticsearch/build.gradle @@ -1,7 +1,7 @@ dependsOn(':test-testng') -usePlugin 'java' -usePlugin 'maven' +apply plugin: 'java' +apply plugin: 'maven' archivesBaseName = "$project.archivesBaseName" @@ -63,9 +63,9 @@ dependencies { test { useTestNG() jmvArgs = ["-ea", "-Xmx1024m"] - options.suiteName = project.name - options.listeners = ["org.elasticsearch.util.testng.Listeners"] - options.systemProperties = ["es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties")] + suiteName = project.name + listeners = ["org.elasticsearch.util.testng.Listeners"] + systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties") } configure(install.repositories.mavenInstaller) { diff --git a/modules/test/integration/build.gradle b/modules/test/integration/build.gradle index c34c424995f..5cc43229217 100644 --- a/modules/test/integration/build.gradle +++ b/modules/test/integration/build.gradle @@ -1,6 +1,6 @@ dependsOn(':elasticsearch') -usePlugin 'java' +apply plugin: 'java' archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" @@ -22,10 +22,8 @@ dependencies { test { useTestNG() jmvArgs = ["-ea", "-Xmx1024m"] - options.suiteName = project.name - options.listeners = ["org.elasticsearch.util.testng.Listeners"] - options.systemProperties = [ - "es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties"), - "java.net.preferIPv4Stack": "true" - ] + suiteName = project.name + listeners = ["org.elasticsearch.util.testng.Listeners"] + systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties") + systemProperties["java.net.preferIPv4Stack"] = "true" } diff --git a/modules/test/testng/build.gradle b/modules/test/testng/build.gradle index c089c4d2119..c580ae529b3 100644 --- a/modules/test/testng/build.gradle +++ b/modules/test/testng/build.gradle @@ -1,4 +1,4 @@ -usePlugin 'java' +apply plugin: 'java' archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" @@ -18,5 +18,5 @@ dependencies { test { useTestNG() - options.systemProperties = ["es.test.log.conf": "log4j-gradle.properties"] + systemProperties['es.test.log.conf'] = 'log4j-gradle.properties' } diff --git a/plugins/attachments/build.gradle b/plugins/attachments/build.gradle index bc0185a617c..c60cb9e0310 100644 --- a/plugins/attachments/build.gradle +++ b/plugins/attachments/build.gradle @@ -1,6 +1,6 @@ dependsOn(':elasticsearch') -usePlugin 'java' +apply plugin: 'java' archivesBaseName = "elasticsearch-attachments" @@ -43,11 +43,9 @@ dependencies { test { useTestNG() jmvArgs = ["-ea", "-Xmx1024m"] - options.suiteName = project.name - options.listeners = ["org.elasticsearch.util.testng.Listeners"] - options.systemProperties = [ - "es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties") - ] + suiteName = project.name + listeners = ["org.elasticsearch.util.testng.Listeners"] + systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties") } task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') << { @@ -67,17 +65,8 @@ task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') < } } -task zip(type: Zip) { - dependsOn explodedDist -// classifier = 'all' -} - -zip.doFirst {task -> - zipRootFolder = "" // its the plugin, don't create it under a specific name - task.configure { - zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) { - // just copy over everything - } +task zip(type: Zip, dependsOn: ['explodedDist']) { + from(explodedDistDir) { } }