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
3a3eb1bc
Commit
3a3eb1bc
authored
Apr 28, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix workaround for JDK-8156584
See gh-26252
parent
ecd1e536
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
JavaConventions.java
.../java/org/springframework/boot/build/JavaConventions.java
+5
-5
No files found.
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View file @
3a3eb1bc
...
...
@@ -21,6 +21,7 @@ import java.io.IOException;
import
java.io.InputStream
;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.nio.file.StandardCopyOption
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.List
;
...
...
@@ -148,14 +149,13 @@ class JavaConventions {
withOptionalBuildJavaHome
(
project
,
(
javaHome
)
->
test
.
setExecutable
(
javaHome
+
"/bin/java"
));
test
.
useJUnitPlatform
();
test
.
setMaxHeapSize
(
"1024M"
);
CopyJdk8156584SecurityProperties
copyJdk8156584SecurityProperties
=
new
CopyJdk8156584SecurityProperties
(
project
);
if
(
buildingWithJava8
(
project
))
{
CopyJdk8156584SecurityProperties
copyJdk8156584SecurityProperties
=
new
CopyJdk8156584SecurityProperties
(
project
);
test
.
systemProperty
(
"java.security.properties"
,
"file:"
+
test
.
getWorkingDir
().
toPath
().
relativize
(
copyJdk8156584SecurityProperties
.
output
));
test
.
setDebug
(
true
);
test
.
doFirst
(
copyJdk8156584SecurityProperties
);
}
test
.
doFirst
(
copyJdk8156584SecurityProperties
);
});
project
.
getPlugins
().
withType
(
JavaPlugin
.
class
,
(
javaPlugin
)
->
project
.
getDependencies
()
.
add
(
JavaPlugin
.
TEST_RUNTIME_ONLY_CONFIGURATION_NAME
,
"org.junit.platform:junit-platform-launcher"
));
...
...
@@ -250,7 +250,7 @@ class JavaConventions {
public
void
execute
(
Task
task
)
{
try
(
InputStream
input
=
getClass
().
getClassLoader
()
.
getResourceAsStream
(
CopyJdk8156584SecurityProperties
.
SECURITY_PROPERTIES_FILE_NAME
))
{
Files
.
copy
(
input
,
this
.
output
);
Files
.
copy
(
input
,
this
.
output
,
StandardCopyOption
.
REPLACE_EXISTING
);
}
catch
(
IOException
ex
)
{
throw
new
RuntimeException
(
ex
);
...
...
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