root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Gradle 6.4 

Closes gh-25020
This commit is contained in:
Sam Brannen 2020-05-06 14:25:41 +02:00
parent 1b85f6277d
commit b1c1a232ca
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -325,7 +325,7 @@ configure([rootProject] + javaProjects) { project ->
checkstyle { checkstyle {
toolVersion = "8.31" toolVersion = "8.31"
configDir = rootProject.file("src/checkstyle") configDirectory.set(rootProject.file("src/checkstyle"))
} }
dependencies { dependencies {

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

Binary file not shown.

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

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

2
gradlew vendored
View File

@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath

1
gradlew.bat vendored
View File

@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

8
spring-core/spring-core.gradle
View File

@ -21,16 +21,16 @@ configurations {
} }
task cglibRepackJar(type: ShadowJar) { task cglibRepackJar(type: ShadowJar) {
baseName = 'spring-cglib-repack' archiveBaseName = 'spring-cglib-repack'
version = cglibVersion archiveVersion = cglibVersion
configurations = [project.configurations.cglib] configurations = [project.configurations.cglib]
relocate 'net.sf.cglib', 'org.springframework.cglib' relocate 'net.sf.cglib', 'org.springframework.cglib'
relocate 'org.objectweb.asm', 'org.springframework.asm' relocate 'org.objectweb.asm', 'org.springframework.asm'
} }
task objenesisRepackJar(type: ShadowJar) { task objenesisRepackJar(type: ShadowJar) {
baseName = 'spring-objenesis-repack' archiveBaseName = 'spring-objenesis-repack'
version = objenesisVersion archiveVersion = objenesisVersion
configurations = [project.configurations.objenesis] configurations = [project.configurations.objenesis]
relocate 'org.objenesis', 'org.springframework.objenesis' relocate 'org.objenesis', 'org.springframework.objenesis'
} }