diff --git a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.jar b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf0..29953ea1 100644 Binary files a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.jar and b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.jar differ diff --git a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.properties b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.properties index 7c4388a9..5028f28f 100644 --- a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew index 83f2acfd..cccdd3d5 100755 --- a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew +++ b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew @@ -1,21 +1,5 @@ #!/usr/bin/env sh -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - ############################################################################## ## ## Gradle start up script for UN*X @@ -44,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='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -125,8 +109,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew.bat b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew.bat index 9618d8d9..f9553162 100644 --- a/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew.bat +++ b/initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew.bat @@ -1,19 +1,3 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -30,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="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS= @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java index dc4fa011..15abeb88 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java @@ -85,7 +85,7 @@ class GradleKtsProjectGenerationConfigurationTests { } static Stream gradleWrapperParameters() { - return Stream.of(Arguments.arguments("2.1.3.RELEASE", "5.6.2")); + return Stream.of(Arguments.arguments("2.1.3.RELEASE", "5.6.4")); } @ParameterizedTest(name = "Spring Boot {0}") diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java index 7046645c..78f0ce29 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java @@ -85,7 +85,7 @@ class GradleProjectGenerationConfigurationTests { static Stream gradleWrapperParameters() { return Stream.of(Arguments.arguments("1.5.17.RELEASE", "3.5.1"), Arguments.arguments("2.0.6.RELEASE", "4.10.3"), - Arguments.arguments("2.1.3.RELEASE", "5.6.2")); + Arguments.arguments("2.1.3.RELEASE", "5.6.4")); } @ParameterizedTest(name = "Spring Boot {0}")