lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-12-19 19:47:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Gradle 4 and 5 support

Browse Source 
Closes gh-1218
This commit is contained in:
Stephane Nicoll
2021-04-13 17:51:38 +02:00
parent b3c0f16422
commit 10d7e857c7
14 changed files with 20 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java
View File

@@ -101,7 +101,7 @@ public class GradleProjectGenerationConfiguration {
}
@Bean
@ConditionalOnGradleVersion({ "4", "5", "6", "7" })
@ConditionalOnGradleVersion({ "6", "7" })
BuildCustomizer<GradleBuild> springBootPluginContributor(ProjectDescription description,
ObjectProvider<DependencyManagementPluginVersionResolver> versionResolver, InitializrMetadata metadata) {
return new SpringBootPluginBuildCustomizer(description, versionResolver
@@ -122,35 +122,6 @@ public class GradleProjectGenerationConfiguration {
return new GradleBuildProjectContributor(buildWriter, build, this.indentingWriterFactory, "build.gradle.kts");
}
/**
* Configuration specific to projects using Gradle 4.
*/
@Configuration
@ConditionalOnGradleVersion("4")
@ConditionalOnBuildSystem(GradleBuildSystem.ID)
static class Gradle4ProjectGenerationConfiguration {
@Bean
GradleWrapperContributor gradle4WrapperContributor() {
return new GradleWrapperContributor("4");
}
}
/**
* Configuration specific to projects using Gradle 5.
*/
@Configuration
@ConditionalOnGradleVersion("5")
static class Gradle5ProjectGenerationConfiguration {
@Bean
GradleWrapperContributor gradle5WrapperContributor() {
return new GradleWrapperContributor("5");
}
}
/**
* Configuration specific to projects using Gradle 6.
*/
@@ -180,11 +151,11 @@ public class GradleProjectGenerationConfiguration {
}
/**
* Configuration specific to projects using Gradle (Groovy DSL) 4, 5, 6, or 7.
* Configuration specific to projects using Gradle (Groovy DSL).
*/
@Configuration
@ConditionalOnBuildSystem(id = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_GROOVY)
@ConditionalOnGradleVersion({ "4", "5", "6", "7" })
@ConditionalOnGradleVersion({ "6", "7" })
static class Gradle4Or5ProjectGenerationConfiguration {
@Bean
@@ -227,7 +198,7 @@ public class GradleProjectGenerationConfiguration {
*/
@Configuration
@ConditionalOnBuildSystem(id = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_KOTLIN)
@ConditionalOnGradleVersion({ "5", "6", "7" })
@ConditionalOnGradleVersion({ "6", "7" })
static class GradleKtsProjectGenerationConfiguration {
@Bean

11
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/OnGradleVersionCondition.java
View File

@@ -36,11 +36,6 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
*/
public class OnGradleVersionCondition extends ProjectGenerationCondition {
private static final VersionRange GRADLE_4_VERSION_RANGE = VersionParser.DEFAULT.parseRange("[2.0.0.M1, 2.1.0.M1)");
private static final VersionRange GRADLE_5_VERSION_RANGE = VersionParser.DEFAULT
.parseRange("[2.1.0.M1,2.2.2.RELEASE)");
private static final VersionRange GRADLE_6_VERSION_RANGE = VersionParser.DEFAULT
.parseRange("[2.2.2.RELEASE,2.5.0-SNAPSHOT)");
@@ -62,12 +57,6 @@ public class OnGradleVersionCondition extends ProjectGenerationCondition {
if (platformVersion == null) {
return null;
}
else if (GRADLE_4_VERSION_RANGE.match(platformVersion)) {
return "4";
}
else if (GRADLE_5_VERSION_RANGE.match(platformVersion)) {
return "5";
}
else if (GRADLE_6_VERSION_RANGE.match(platformVersion)) {
return "6";
}

BIN
initializr-generator-spring/src/main/resources/gradle/4/wrapper/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

5
initializr-generator-spring/src/main/resources/gradle/4/wrapper/gradle/wrapper/gradle-wrapper.properties vendored
View File

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

172
initializr-generator-spring/src/main/resources/gradle/4/wrapper/gradlew vendored
View File

@@ -1,172 +0,0 @@
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
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=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# 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"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

84
initializr-generator-spring/src/main/resources/gradle/4/wrapper/gradlew.bat vendored
View File

@@ -1,84 +0,0 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
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=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@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%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

BIN
initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

5
initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradle/wrapper/gradle-wrapper.properties vendored
View File

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

172
initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew vendored
View File

@@ -1,172 +0,0 @@
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
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=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# 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"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

84
initializr-generator-spring/src/main/resources/gradle/5/wrapper/gradlew.bat vendored
View File

@@ -1,84 +0,0 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
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=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@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%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

50
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java
View File

@@ -36,22 +36,6 @@ public class ConditionalOnGradleVersionTests {
private final ProjectAssetTester projectTester = new ProjectAssetTester()
.withConfiguration(GradleVersionTestConfiguration.class);
@Test
void outcomeWithSpringBoot20() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.0.9.RELEASE"));
this.projectTester.configure(description, (context) -> assertThat(context).hasSingleBean(String.class)
.getBean(String.class).isEqualTo("testGradle4"));
}
@Test
void outcomeWithSpringBoot21() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.3.RELEASE"));
this.projectTester.configure(description, (context) -> assertThat(context).hasSingleBean(String.class)
.getBean(String.class).isEqualTo("testGradle5"));
}
@Test
void outcomeWithSpringBoot23() {
MutableProjectDescription description = new MutableProjectDescription();
@@ -90,36 +74,16 @@ public class ConditionalOnGradleVersionTests {
}
@Test
void outcomeWithSpringBoot20AndMultipleGenerations() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.0.9.RELEASE"));
this.projectTester.withConfiguration(Gradle4Or5TestConfiguration.class).configure(description,
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle4", "gradle4Or5"));
}
@Test
void outcomeWithSpringBoot24AndMultipleNonMatchingGenerations() {
void outcomeWithSpringBoot24AndMultipleGenerations() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.4.0"));
this.projectTester.withConfiguration(Gradle4Or5TestConfiguration.class).configure(description,
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle6"));
this.projectTester.withConfiguration(Gradle6Or7TestConfiguration.class).configure(description,
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle6", "gradle6Or7"));
}
@Configuration
static class GradleVersionTestConfiguration {
@Bean
@ConditionalOnGradleVersion("4")
String gradle4() {
return "testGradle4";
}
@Bean
@ConditionalOnGradleVersion("5")
String gradle5() {
return "testGradle5";
}
@Bean
@ConditionalOnGradleVersion("6")
String gradle6() {
@@ -135,12 +99,12 @@ public class ConditionalOnGradleVersionTests {
}
@Configuration
static class Gradle4Or5TestConfiguration {
static class Gradle6Or7TestConfiguration {
@Bean
@ConditionalOnGradleVersion({ "4", "5" })
String gradle4Or5() {
return "testGradle4Or5";
@ConditionalOnGradleVersion({ "6", "7" })
String gradle6Or7() {
return "testGradle6Or7";
}
}

12
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java
View File

@@ -67,8 +67,7 @@ class GradleKtsProjectGenerationConfigurationTests {
static Stream<Arguments> supportedPlatformVersions() {
// previous versions use gradle < 5, where Kotlin DSL is not supported
return Stream.of(Arguments.arguments("2.1.3.RELEASE"), Arguments.arguments("2.2.3.RELEASE"),
Arguments.arguments("2.5.0"));
return Stream.of(Arguments.arguments("2.2.3.RELEASE"), Arguments.arguments("2.5.0"));
}
@ParameterizedTest(name = "Spring Boot {0}")
@@ -86,8 +85,7 @@ class GradleKtsProjectGenerationConfigurationTests {
}
static Stream<Arguments> gradleWrapperParameters() {
return Stream.of(Arguments.arguments("2.1.3.RELEASE", "5.6.4"), Arguments.arguments("2.2.3.RELEASE", "6.8.3"),
Arguments.arguments("2.5.0", "7.0"));
return Stream.of(Arguments.arguments("2.2.3.RELEASE", "6.8.3"), Arguments.arguments("2.5.0", "7.0"));
}
@ParameterizedTest(name = "Spring Boot {0}")
@@ -142,7 +140,7 @@ class GradleKtsProjectGenerationConfigurationTests {
@Test
void dependencyManagementPluginFallbacksToMetadataIfNotPresent() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
description.setPlatformVersion(Version.parse("2.4.0"));
description.setLanguage(new JavaLanguage("11"));
ProjectStructure project = this.projectTester.generate(description);
assertThat(project).textFile("build.gradle.kts").lines()
@@ -152,7 +150,7 @@ class GradleKtsProjectGenerationConfigurationTests {
@Test
void dependencyManagementPluginVersionResolverIsUsedIfPresent() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
description.setPlatformVersion(Version.parse("2.4.0"));
description.setLanguage(new JavaLanguage("11"));
ProjectStructure project = this.projectTester
.withBean(DependencyManagementPluginVersionResolver.class, () -> (d) -> "1.5.1.RC1")
@@ -164,7 +162,7 @@ class GradleKtsProjectGenerationConfigurationTests {
@Test
void warPluginIsAppliedWhenBuildingProjectThatUsesWarPackaging() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
description.setPlatformVersion(Version.parse("2.4.0"));
description.setLanguage(new JavaLanguage());
description.setPackaging(new WarPackaging());
ProjectStructure project = this.projectTester.generate(description);

8
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java
View File

@@ -65,8 +65,7 @@ class GradleProjectGenerationConfigurationTests {
}
static Stream<Arguments> supportedPlatformVersions() {
return Stream.of(Arguments.arguments("2.1.3.RELEASE"), Arguments.arguments("2.2.3.RELEASE"),
Arguments.arguments("2.5.0"));
return Stream.of(Arguments.arguments("2.2.3.RELEASE"), Arguments.arguments("2.5.0"));
}
@ParameterizedTest(name = "Spring Boot {0}")
@@ -84,8 +83,7 @@ class GradleProjectGenerationConfigurationTests {
}
static Stream<Arguments> gradleWrapperParameters() {
return Stream.of(Arguments.arguments("2.0.6.RELEASE", "4.10.3"), Arguments.arguments("2.1.3.RELEASE", "5.6.4"),
Arguments.arguments("2.2.3.RELEASE", "6.8.3"), Arguments.arguments("2.5.0", "7.0"));
return Stream.of(Arguments.arguments("2.2.3.RELEASE", "6.8.3"), Arguments.arguments("2.5.0", "7.0"));
}
@ParameterizedTest(name = "Spring Boot {0}")
@@ -139,7 +137,7 @@ class GradleProjectGenerationConfigurationTests {
@Test
void warPluginIsAppliedWhenBuildingProjectThatUsesWarPackaging() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
description.setPlatformVersion(Version.parse("2.4.0.RELEASE"));
description.setLanguage(new JavaLanguage());
description.setPackaging(new WarPackaging());
ProjectStructure project = this.projectTester.generate(description);

3
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleWrapperContributorTests.java
View File

@@ -41,8 +41,7 @@ class GradleWrapperContributorTests {
Path directory;
static Stream<Arguments> parameters() {
return Stream.of(Arguments.arguments("4"), Arguments.arguments("5"), Arguments.arguments("6"),
Arguments.arguments("7"));
return Stream.of(Arguments.arguments("6"), Arguments.arguments("7"));
}
@ParameterizedTest(name = "Gradle {0}")