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
b9764838
Commit
b9764838
authored
Apr 30, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.4.x'
Closes gh-26330
parents
6df3a829
c0fe2318
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
GradleCompatibilityExtension.java
...ework/boot/gradle/junit/GradleCompatibilityExtension.java
+1
-1
GradleBuild.java
.../org/springframework/boot/gradle/testkit/GradleBuild.java
+1
-0
No files found.
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View file @
b9764838
...
@@ -51,7 +51,7 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
...
@@ -51,7 +51,7 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
GRADLE_VERSIONS
=
Arrays
.
asList
(
"7.0"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"7.0"
);
}
}
else
{
else
{
GRADLE_VERSIONS
=
Arrays
.
asList
(
"current"
,
"7.0"
);
GRADLE_VERSIONS
=
Arrays
.
asList
(
"current"
,
"
6.9-rc-1"
,
"
7.0"
);
}
}
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View file @
b9764838
...
@@ -175,6 +175,7 @@ public class GradleBuild {
...
@@ -175,6 +175,7 @@ public class GradleBuild {
scriptContent
=
scriptContent
.
replace
(
"{"
+
property
.
getKey
()
+
"}"
,
property
.
getValue
());
scriptContent
=
scriptContent
.
replace
(
"{"
+
property
.
getKey
()
+
"}"
,
property
.
getValue
());
}
}
FileCopyUtils
.
copy
(
scriptContent
,
new
FileWriter
(
new
File
(
this
.
projectDir
,
"build"
+
this
.
dsl
.
getExtension
())));
FileCopyUtils
.
copy
(
scriptContent
,
new
FileWriter
(
new
File
(
this
.
projectDir
,
"build"
+
this
.
dsl
.
getExtension
())));
new
File
(
this
.
projectDir
,
"settings.gradle"
).
createNewFile
();
FileSystemUtils
.
copyRecursively
(
new
File
(
"src/test/resources/repository"
),
FileSystemUtils
.
copyRecursively
(
new
File
(
"src/test/resources/repository"
),
new
File
(
this
.
projectDir
,
"repository"
));
new
File
(
this
.
projectDir
,
"repository"
));
GradleRunner
gradleRunner
=
GradleRunner
.
create
().
withProjectDir
(
this
.
projectDir
)
GradleRunner
gradleRunner
=
GradleRunner
.
create
().
withProjectDir
(
this
.
projectDir
)
...
...
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