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

Update to Gradle 1.9

Browse Source 
Necessary to work with the latest Bamboo and Artifactory Gradle updates
This commit is contained in:
Rob Winch 2013-07-15 10:14:34 -05:00
parent 905c59f599
commit 1feb38048b
7 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -88,5 +88,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.2' 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 ->

6
gradle/javaprojects.gradle
View File

@ -16,7 +16,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,
@ -79,8 +79,8 @@ 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.5', 'org.mockito:mockito-core:1.9.5',
"org.springframework:spring-test:$springVersion" "org.springframework:spring-test:$springVersion"
// Use slf4j/logback for logging // Use slf4j/logback for logging

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 @@
#Fri Sep 21 14:16:44 CDT 2012 #Thu Dec 05 08:38:26 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.2-bin.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip

4
gradlew vendored
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################## ##############################################################################
## ##
@ -7,7 +7,7 @@
############################################################################## ##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="-Xmx1024M -XX:MaxPermSize=256M" DEFAULT_JVM_OPTS=""
APP_NAME="Gradle" APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=`basename "$0"`

2
gradlew.bat vendored
View File

@ -9,7 +9,7 @@
if "%OS%"=="Windows_NT" setlocal 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. @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=-Xmx1024M -XX:MaxPermSize=256M set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%" == "" set DIRNAME=.