diff --git a/build.gradle b/build.gradle index 4bd302137..fd08c9b81 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ configure(subprojects) { subproject -> // Testing testCompile "org.spockframework:spock-core:$spockVersion" testCompile "org.spockframework:spock-spring:$spockVersion" - testCompile "org.hamcrest:hamcrest-library:1.1" + testCompile "org.hamcrest:hamcrest-library:1.2.1" testCompile "org.springframework:spring-test:$springVersion" testRuntime "org.springframework:spring-context-support:$springVersion" @@ -82,13 +82,10 @@ configure(subprojects) { subproject -> } -task wrapper(type: Wrapper) { gradleVersion = "1.0-rc-1" } +task wrapper(type: Wrapper) { gradleVersion = "1.0" } idea { module { - inheritOutputDirs = false - outputDir = file("build/classes/main") - testOutputDir = file("build/classes/test") downloadJavadoc = false downloadSources = true } diff --git a/gradle.properties b/gradle.properties index 54a4204a3..1138918a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Logging -slf4jVersion = 1.6.4 -logbackVersion = 1.0.1 +slf4jVersion = 1.6.6 +logbackVersion = 1.0.3 # Libraries springVersion = 3.1.1.RELEASE @@ -10,13 +10,13 @@ cglibVersion = 2.2 groovyVersion = 1.8.6 # Supporting libraries -sdCommonsVersion = 1.3.0.RELEASE +sdCommonsVersion = 1.3.1.RELEASE sdJpaVersion = 1.1.0.RELEASE -jacksonVersion = 1.9.5 -hibernateVersion = 4.1.1.Final +jacksonVersion = 1.9.7 +hibernateVersion = 4.1.4.Final # Testing -spockVersion = 0.5-groovy-1.8 +spockVersion = 0.6-groovy-1.8 ## OSGi ranges spring.range = "[3.1.1, 4.0.0)" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ce16961d3..e3b3376e6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cbcb63a36..199161188 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 27 15:44:36 CDT 2012 +#Tue Jun 19 08:16:00 CDT 2012 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-rc-1-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip diff --git a/gradlew b/gradlew index ae91ed902..cf1265090 100755 --- a/gradlew +++ b/gradlew @@ -107,7 +107,7 @@ 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