Jelajahi Sumber

Update to Gradle 5.0

Change project's gradle version to 5.0, this requires to make some minor
adjustments.

Fixes: gh-6148
Daniel Bustamante Ospina 6 tahun lalu
induk
melakukan
6bddb38cac

+ 1 - 1
buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy

@@ -48,7 +48,7 @@ class AspectJPlugin implements Plugin<Project> {
 			def javaCompileTaskName = javaCompileTask.name
 			def ajCompileTask = project.tasks.create(name: javaCompileTaskName + 'Aspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) {
 				inputs.files(javaCompileTask.inputs.files)
-				inputs.properties(javaCompileTask.inputs.properties)
+				inputs.properties(javaCompileTask.inputs.properties.findAll {it.value != null})
 
 				sourceRoots.addAll(project.sourceSets.main.java.srcDirs)
 				if(javaCompileTaskName.contains("Test")) {

+ 0 - 3
config/spring-security-config.gradle

@@ -73,9 +73,6 @@ dependencies {
 	testRuntime 'org.hsqldb:hsqldb'
 }
 
-test {
-	inputs.file file("$rootDir/docs/manual/src/docbook/appendix-namespace.xml")
-}
 
 rncToXsd {
 	rncDir = file('src/main/resources/org/springframework/security/config/')

TEMPAT SAMPAH
gradle/wrapper/gradle-wrapper.jar


+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 1 - 1
gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

+ 1 - 1
gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @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 DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome