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
b50b00d6
Commit
b50b00d6
authored
May 27, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use sorted properties to ensure output is repeatable
Closes gh-21593
parent
343e4d43
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
AutoConfigurationMetadata.java
...k/boot/build/autoconfigure/AutoConfigurationMetadata.java
+3
-1
StarterMetadata.java
.../springframework/boot/build/starters/StarterMetadata.java
+3
-1
TestSliceMetadata.java
...work/boot/build/test/autoconfigure/TestSliceMetadata.java
+2
-1
No files found.
buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationMetadata.java
View file @
b50b00d6
...
...
@@ -30,6 +30,8 @@ import org.gradle.api.tasks.OutputFile;
import
org.gradle.api.tasks.SourceSet
;
import
org.gradle.api.tasks.TaskAction
;
import
org.springframework.core.CollectionFactory
;
/**
* A {@link Task} for generating metadata describing a project's auto-configuration
* classes.
...
...
@@ -73,7 +75,7 @@ public class AutoConfigurationMetadata extends AbstractTask {
}
private
Properties
readAutoConfiguration
()
throws
IOException
{
Properties
autoConfiguration
=
new
Properties
(
);
Properties
autoConfiguration
=
CollectionFactory
.
createSortedProperties
(
true
);
Properties
springFactories
=
readSpringFactories
(
new
File
(
this
.
sourceSet
.
getOutput
().
getResourcesDir
(),
"META-INF/spring.factories"
));
autoConfiguration
.
setProperty
(
"autoConfigurationClassNames"
,
...
...
buildSrc/src/main/java/org/springframework/boot/build/starters/StarterMetadata.java
View file @
b50b00d6
...
...
@@ -32,6 +32,8 @@ import org.gradle.api.tasks.InputFiles;
import
org.gradle.api.tasks.OutputFile
;
import
org.gradle.api.tasks.TaskAction
;
import
org.springframework.core.CollectionFactory
;
/**
* A {@link Task} for generating metadata that describes a starter.
*
...
...
@@ -68,7 +70,7 @@ public class StarterMetadata extends AbstractTask {
@TaskAction
void
generateMetadata
()
throws
IOException
{
Properties
properties
=
new
Properties
(
);
Properties
properties
=
CollectionFactory
.
createSortedProperties
(
true
);
properties
.
setProperty
(
"name"
,
getProject
().
getName
());
properties
.
setProperty
(
"description"
,
getProject
().
getDescription
());
properties
.
setProperty
(
"dependencies"
,
String
.
join
(
","
,
this
.
dependencies
.
getResolvedConfiguration
()
...
...
buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadata.java
View file @
b50b00d6
...
...
@@ -42,6 +42,7 @@ import org.gradle.api.tasks.OutputFile;
import
org.gradle.api.tasks.SourceSet
;
import
org.gradle.api.tasks.TaskAction
;
import
org.springframework.core.CollectionFactory
;
import
org.springframework.core.io.FileSystemResource
;
import
org.springframework.core.type.AnnotationMetadata
;
import
org.springframework.core.type.classreading.MetadataReader
;
...
...
@@ -91,7 +92,7 @@ public class TestSliceMetadata extends AbstractTask {
}
private
Properties
readTestSlices
()
throws
IOException
{
Properties
testSlices
=
new
Properties
(
);
Properties
testSlices
=
CollectionFactory
.
createSortedProperties
(
true
);
try
(
URLClassLoader
classLoader
=
new
URLClassLoader
(
StreamSupport
.
stream
(
this
.
sourceSet
.
getRuntimeClasspath
().
spliterator
(),
false
).
map
(
this
::
toURL
)
.
toArray
(
URL
[]::
new
)))
{
...
...
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