Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
386d678d
Commit
386d678d
authored
Apr 24, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Gradle's CreateStartScripts task with 6.4 and later
Fixes gh-20759
parent
addaf5ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
ApplicationPluginAction.java
...framework/boot/gradle/plugin/ApplicationPluginAction.java
+12
-2
GradleCompatibilityExtension.java
...ework/boot/gradle/junit/GradleCompatibilityExtension.java
+1
-1
ApplicationPluginActionIntegrationTests.gradle
...dle/plugin/ApplicationPluginActionIntegrationTests.gradle
+1
-1
No files found.
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
View file @
386d678d
...
@@ -36,6 +36,8 @@ import org.gradle.api.plugins.ApplicationPluginConvention;
...
@@ -36,6 +36,8 @@ import org.gradle.api.plugins.ApplicationPluginConvention;
import
org.gradle.api.provider.Property
;
import
org.gradle.api.provider.Property
;
import
org.gradle.api.provider.Provider
;
import
org.gradle.api.provider.Provider
;
import
org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator
;
import
org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator
;
import
org.gradle.jvm.application.tasks.CreateStartScripts
;
import
org.gradle.util.GradleVersion
;
import
org.springframework.boot.gradle.tasks.application.CreateBootStartScripts
;
import
org.springframework.boot.gradle.tasks.application.CreateBootStartScripts
;
...
@@ -53,8 +55,8 @@ final class ApplicationPluginAction implements PluginApplicationAction {
...
@@ -53,8 +55,8 @@ final class ApplicationPluginAction implements PluginApplicationAction {
DistributionContainer
distributions
=
project
.
getExtensions
().
getByType
(
DistributionContainer
.
class
);
DistributionContainer
distributions
=
project
.
getExtensions
().
getByType
(
DistributionContainer
.
class
);
Distribution
distribution
=
distributions
.
create
(
"boot"
);
Distribution
distribution
=
distributions
.
create
(
"boot"
);
configureBaseNameConvention
(
project
,
applicationConvention
,
distribution
);
configureBaseNameConvention
(
project
,
applicationConvention
,
distribution
);
Create
Boot
StartScripts
bootStartScripts
=
project
.
getTasks
().
create
(
"bootStartScripts"
,
CreateStartScripts
bootStartScripts
=
project
.
getTasks
().
create
(
"bootStartScripts"
,
CreateBootStartScripts
.
class
);
determineCreateStartScriptsClass
()
);
bootStartScripts
bootStartScripts
.
setDescription
(
"Generates OS-specific start scripts to run the project as a Spring Boot application."
);
.
setDescription
(
"Generates OS-specific start scripts to run the project as a Spring Boot application."
);
((
TemplateBasedScriptGenerator
)
bootStartScripts
.
getUnixStartScriptGenerator
())
((
TemplateBasedScriptGenerator
)
bootStartScripts
.
getUnixStartScriptGenerator
())
...
@@ -79,6 +81,14 @@ final class ApplicationPluginAction implements PluginApplicationAction {
...
@@ -79,6 +81,14 @@ final class ApplicationPluginAction implements PluginApplicationAction {
distribution
.
getContents
().
with
(
binCopySpec
);
distribution
.
getContents
().
with
(
binCopySpec
);
}
}
private
Class
<?
extends
CreateStartScripts
>
determineCreateStartScriptsClass
()
{
return
isGradle64OrLater
()
?
CreateStartScripts
.
class
:
CreateBootStartScripts
.
class
;
}
private
boolean
isGradle64OrLater
()
{
return
GradleVersion
.
current
().
getBaseVersion
().
compareTo
(
GradleVersion
.
version
(
"6.4"
))
>=
0
;
}
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
private
void
configureBaseNameConvention
(
Project
project
,
ApplicationPluginConvention
applicationConvention
,
private
void
configureBaseNameConvention
(
Project
project
,
ApplicationPluginConvention
applicationConvention
,
Distribution
distribution
)
{
Distribution
distribution
)
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View file @
386d678d
...
@@ -39,7 +39,7 @@ import org.springframework.boot.gradle.testkit.GradleBuildExtension;
...
@@ -39,7 +39,7 @@ import org.springframework.boot.gradle.testkit.GradleBuildExtension;
public
final
class
GradleCompatibilityExtension
implements
TestTemplateInvocationContextProvider
{
public
final
class
GradleCompatibilityExtension
implements
TestTemplateInvocationContextProvider
{
private
static
final
List
<
String
>
GRADLE_VERSIONS
=
Arrays
.
asList
(
"default"
,
"5.0"
,
"5.1.1"
,
"5.2.1"
,
"5.3.1"
,
private
static
final
List
<
String
>
GRADLE_VERSIONS
=
Arrays
.
asList
(
"default"
,
"5.0"
,
"5.1.1"
,
"5.2.1"
,
"5.3.1"
,
"5.4.1"
,
"5.5.1"
,
"5.6.4"
,
"6.0.1"
,
"6.1.1"
,
"6.2.2"
,
"6.3"
);
"5.4.1"
,
"5.5.1"
,
"5.6.4"
,
"6.0.1"
,
"6.1.1"
,
"6.2.2"
,
"6.3"
,
"6.4"
);
@Override
@Override
public
Stream
<
TestTemplateInvocationContext
>
provideTestTemplateInvocationContexts
(
ExtensionContext
context
)
{
public
Stream
<
TestTemplateInvocationContext
>
provideTestTemplateInvocationContexts
(
ExtensionContext
context
)
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.gradle
View file @
386d678d
...
@@ -31,7 +31,7 @@ task('javaCompileEncoding') {
...
@@ -31,7 +31,7 @@ task('javaCompileEncoding') {
task
(
'startScriptsDefaultJvmOpts'
)
{
task
(
'startScriptsDefaultJvmOpts'
)
{
doFirst
{
doFirst
{
tasks
.
withType
(
org
.
springframework
.
boot
.
gradle
.
tasks
.
application
.
CreateBootStartScripts
)
{
tasks
.
getByName
(
"bootStartScripts"
)
{
println
"$name defaultJvmOpts = $defaultJvmOpts"
println
"$name defaultJvmOpts = $defaultJvmOpts"
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment