Skip to content

Commit 6bddb38

Browse files
dbuosrwinch
authored andcommitted
Update to Gradle 5.0
Change project's gradle version to 5.0, this requires to make some minor adjustments. Fixes: gh-6148
1 parent f808740 commit 6bddb38

File tree

6 files changed

+4
-7
lines changed

6 files changed

+4
-7
lines changed

buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class AspectJPlugin implements Plugin<Project> {
4848
def javaCompileTaskName = javaCompileTask.name
4949
def ajCompileTask = project.tasks.create(name: javaCompileTaskName + 'Aspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) {
5050
inputs.files(javaCompileTask.inputs.files)
51-
inputs.properties(javaCompileTask.inputs.properties)
51+
inputs.properties(javaCompileTask.inputs.properties.findAll {it.value != null})
5252

5353
sourceRoots.addAll(project.sourceSets.main.java.srcDirs)
5454
if(javaCompileTaskName.contains("Test")) {

config/spring-security-config.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ dependencies {
7373
testRuntime 'org.hsqldb:hsqldb'
7474
}
7575

76-
test {
77-
inputs.file file("$rootDir/docs/manual/src/docbook/appendix-namespace.xml")
78-
}
7976

8077
rncToXsd {
8178
rncDir = file('src/main/resources/org/springframework/security/config/')

gradle/wrapper/gradle-wrapper.jar

-436 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
2828
APP_BASE_NAME=`basename "$0"`
2929

3030
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
31+
DEFAULT_JVM_OPTS='"-Xmx64m"'
3232

3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"

gradlew.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
1414
set APP_HOME=%DIRNAME%
1515

1616
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
17+
set DEFAULT_JVM_OPTS="-Xmx64m"
1818

1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome

0 commit comments

Comments
 (0)