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
806464ed
Commit
806464ed
authored
Oct 23, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update BootBuildImage to support Gradle's configuration cache
See gh-22922
parent
b1c4af40
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
BootBuildImage.java
...gframework/boot/gradle/tasks/bundling/BootBuildImage.java
+10
-4
BootBuildImageIntegrationTests.java
...gradle/tasks/bundling/BootBuildImageIntegrationTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java
View file @
806464ed
...
...
@@ -59,6 +59,10 @@ public class BootBuildImage extends DefaultTask {
private
static
final
String
BUILDPACK_JVM_VERSION_KEY
=
"BP_JVM_VERSION"
;
private
final
String
projectName
;
private
final
Property
<
String
>
projectVersion
;
private
RegularFileProperty
jar
;
private
Property
<
JavaVersion
>
targetJavaVersion
;
...
...
@@ -84,6 +88,9 @@ public class BootBuildImage extends DefaultTask {
public
BootBuildImage
()
{
this
.
jar
=
getProject
().
getObjects
().
fileProperty
();
this
.
targetJavaVersion
=
getProject
().
getObjects
().
property
(
JavaVersion
.
class
);
this
.
projectName
=
getProject
().
getName
();
this
.
projectVersion
=
getProject
().
getObjects
().
property
(
String
.
class
);
this
.
projectVersion
.
set
(
getProject
().
provider
(()
->
getProject
().
getVersion
().
toString
()));
}
/**
...
...
@@ -318,12 +325,11 @@ public class BootBuildImage extends DefaultTask {
if
(
StringUtils
.
hasText
(
this
.
imageName
))
{
return
ImageReference
.
of
(
this
.
imageName
);
}
ImageName
imageName
=
ImageName
.
of
(
getProject
().
getName
());
String
version
=
getProject
().
getVersion
().
toString
();
if
(
"unspecified"
.
equals
(
version
))
{
ImageName
imageName
=
ImageName
.
of
(
this
.
projectName
);
if
(
"unspecified"
.
equals
(
this
.
projectVersion
.
get
()))
{
return
ImageReference
.
of
(
imageName
);
}
return
ImageReference
.
of
(
imageName
,
version
);
return
ImageReference
.
of
(
imageName
,
this
.
projectVersion
.
get
()
);
}
private
BuildRequest
customize
(
BuildRequest
request
)
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
View file @
806464ed
...
...
@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Andy Wilkinson
* @author Scott Frederick
*/
@GradleCompatibility
@GradleCompatibility
(
configurationCache
=
true
)
@DisabledIfDockerUnavailable
class
BootBuildImageIntegrationTests
{
...
...
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