Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-23 04:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Gradle 1.9

Browse Source 
This is necessary to work with the latest Bamboo and Artifactory Gradle plugin
This commit is contained in:
Rob Winch 2013-07-15 10:14:34 -05:00
parent 8d312a6365
commit 3074dd8193
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -80,5 +80,5 @@ artifacts {
apply from: "$rootDir/gradle/ide-integration.gradle" apply from: "$rootDir/gradle/ide-integration.gradle"
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.1' gradleVersion = '1.9'
} }

9
buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy
View File

@ -38,21 +38,26 @@ class AspectJPlugin implements Plugin<Project> {
project.configurations.add('aspectpath') project.configurations.add('aspectpath')
} }
project.tasks.add(name: 'compileJava', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) { project.tasks.add(name: 'compileAspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) {
dependsOn project.configurations*.getTaskDependencyFromProjectDependency(true, "compileJava")
dependsOn project.processResources dependsOn project.processResources
sourceSet = project.sourceSets.main sourceSet = project.sourceSets.main
inputs.files(sourceSet.java.srcDirs) inputs.files(sourceSet.java.srcDirs)
outputs.dir(sourceSet.output.classesDir) outputs.dir(sourceSet.output.classesDir)
aspectPath = project.configurations.aspectpath aspectPath = project.configurations.aspectpath
} }
project.tasks.compileJava.deleteAllActions()
project.tasks.compileJava.dependsOn project.tasks.compileAspect
project.tasks.add(name: 'compileTestJava', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) { project.tasks.add(name: 'compileTestAspect', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) {
dependsOn project.processTestResources, project.compileJava, project.jar dependsOn project.processTestResources, project.compileJava, project.jar
sourceSet = project.sourceSets.test sourceSet = project.sourceSets.test
inputs.files(sourceSet.java.srcDirs) inputs.files(sourceSet.java.srcDirs)
outputs.dir(sourceSet.output.classesDir) outputs.dir(sourceSet.output.classesDir)
aspectPath = project.files(project.configurations.aspectpath, project.jar.archivePath) aspectPath = project.files(project.configurations.aspectpath, project.jar.archivePath)
} }
project.tasks.compileTestJava.deleteAllActions()
project.tasks.compileTestJava.dependsOn project.tasks.compileTestAspect
project.tasks.withType(GenerateEclipseProject) { project.tasks.withType(GenerateEclipseProject) {
project.eclipse.project.file.whenMerged { p -> project.eclipse.project.file.whenMerged { p ->

11
gradle/javaprojects.gradle
View File

@ -15,7 +15,7 @@ ext.hsqlVersion = '1.8.0.10'
ext.slf4jVersion = '1.6.1' ext.slf4jVersion = '1.6.1'
ext.logbackVersion = '0.9.29' ext.logbackVersion = '0.9.29'
ext.cglibVersion = '2.2' ext.cglibVersion = '2.2'
ext.powerMockVersion = '1.4.12' ext.powerMockVersion = '1.5.1'
ext.bundlorProperties = [ ext.bundlorProperties = [
version: version, version: version,
@ -74,10 +74,11 @@ dependencies {
exclude(group: 'commons-logging', module: 'commons-logging') exclude(group: 'commons-logging', module: 'commons-logging')
} }
testCompile 'junit:junit:4.7', testCompile 'junit:junit:4.10',
'org.mockito:mockito-core:1.8.3', 'junit:junit-dep:4.10',
'org.jmock:jmock:2.5.1', 'org.mockito:mockito-core:1.9.5',
'org.jmock:jmock-junit4:2.5.1', 'org.jmock:jmock:2.6.0',
'org.jmock:jmock-junit4:2.6.0',
'org.hamcrest:hamcrest-core:1.1', 'org.hamcrest:hamcrest-core:1.1',
'org.hamcrest:hamcrest-library:1.1', 'org.hamcrest:hamcrest-library:1.1',
"org.springframework:spring-test:$springVersion" "org.springframework:spring-test:$springVersion"

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Tue Oct 02 08:45:52 CDT 2012 #Thu Dec 05 09:36:48 CST 2013
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip

4
gradlew vendored
View File

@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
fi fi
done done
SAVED="`pwd`" SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`" APP_HOME="`pwd -P`"
cd "$SAVED" cd "$SAVED" >&-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar