root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.2.x' 

Closes gh-21098
This commit is contained in:
Stephane Nicoll 2020-04-23 14:12:37 +02:00
parent d05c973e71 311952730e
commit 6c02daf2bc
4 changed files with 1906 additions and 1887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1060
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

File diff suppressed because it is too large Load Diff

2375
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

File diff suppressed because it is too large Load Diff

12
spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -1,5 +1,11 @@
{ {
"properties": [ "properties": [
{
"name": "spring.devtools.add-properties",
"type": "java.lang.Boolean",
"description": "Whether to enable development property defaults.",
"defaultValue": true
},
{ {
"name": "spring.devtools.remote.debug.enabled", "name": "spring.devtools.remote.debug.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
@ -19,12 +25,6 @@
"reason": "Remote debug is no longer supported.", "reason": "Remote debug is no longer supported.",
"level": "error" "level": "error"
} }
},
{
"name": "spring.devtools.add-properties",
"type": "java.lang.Boolean",
"description": "Whether to enable development property defaults.",
"defaultValue": true
} }
] ]
} }

332
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -7,57 +7,71 @@
], ],
"properties": [ "properties": [
{ {
"name": "spring.banner.charset", "name": "banner.charset",
"type": "java.nio.charset.Charset", "type": "java.nio.charset.Charset",
"description": "Banner file encoding.", "description": "Banner file encoding.",
"defaultValue": "UTF-8" "defaultValue": "UTF-8",
"deprecation": {
"replacement": "spring.banner.charset",
"level": "error"
}
}, },
{ {
"name": "spring.banner.location", "name": "banner.image.height",
"type": "java.lang.Integer",
"description": "Banner image height (in chars).",
"deprecation": {
"replacement": "spring.banner.image.height",
"level": "error"
}
},
{
"name": "banner.image.invert",
"type": "java.lang.Boolean",
"description": "Invert images for dark console themes.",
"defaultValue": false,
"deprecation": {
"replacement": "spring.banner.image.invert",
"level": "error"
}
},
{
"name": "banner.image.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner image file location (jpg/png can also be used).",
"defaultValue": "banner.gif",
"deprecation": {
"replacement": "spring.banner.image.location",
"level": "error"
}
},
{
"name": "banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin (in chars).",
"deprecation": {
"replacement": "spring.banner.image.margin",
"level": "error"
}
},
{
"name": "banner.image.width",
"type": "java.lang.Integer",
"description": "Banner image width (in chars).",
"deprecation": {
"replacement": "spring.banner.image.width",
"level": "error"
}
},
{
"name": "banner.location",
"type": "org.springframework.core.io.Resource", "type": "org.springframework.core.io.Resource",
"description": "Banner text resource location.", "description": "Banner text resource location.",
"defaultValue": "classpath:banner.txt" "defaultValue": "classpath:banner.txt",
}, "deprecation": {
{ "replacement": "spring.banner.location",
"name": "spring.banner.image.location", "level": "error"
"type": "org.springframework.core.io.Resource", }
"description": "Banner image file location (jpg or png can also be used).",
"defaultValue": "classpath:banner.gif"
},
{
"name": "spring.banner.image.width",
"type": "java.lang.Integer",
"description": "Width of the banner image in chars.",
"defaultValue": 76
},
{
"name": "spring.banner.image.height",
"type": "java.lang.Integer",
"description": "Height of the banner image in chars (default based on image height)."
},
{
"name": "spring.banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin in chars.",
"defaultValue": 2
},
{
"name": "spring.banner.image.invert",
"type": "java.lang.Boolean",
"description": "Whether images should be inverted for dark terminal themes.",
"defaultValue": false
},
{
"name": "spring.banner.image.bitdepth",
"type": "java.lang.Integer",
"description": "The bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).",
"defaultValue": 4
},
{
"name": "spring.banner.image.pixelmode",
"type": "org.springframework.boot.ImageBanner$PixelMode",
"description": "The pixel mode to use when rendering the image.",
"defaultValue": "TEXT"
}, },
{ {
"name": "debug", "name": "debug",
@ -79,6 +93,15 @@
"defaultValue": "%wEx", "defaultValue": "%wEx",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
}, },
{
"name": "logging.file",
"type": "java.lang.String",
"description": "Log file name (for instance, `myapp.log`). Names can be an exact location or relative to the current directory.",
"deprecation": {
"replacement": "logging.file.name",
"level": "error"
}
},
{ {
"name": "logging.file.clean-history-on-start", "name": "logging.file.clean-history-on-start",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
@ -86,6 +109,20 @@
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": false "defaultValue": false
}, },
{
"name": "logging.file.max-history",
"type": "java.lang.Integer",
"description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": 7
},
{
"name": "logging.file.max-size",
"type": "org.springframework.util.unit.DataSize",
"description": "Maximum log file size. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": "10MB"
},
{ {
"name": "logging.file.name", "name": "logging.file.name",
"type": "java.lang.String", "type": "java.lang.String",
@ -98,20 +135,6 @@
"description": "Location of the log file. For instance, `/var/log`.", "description": "Location of the log file. For instance, `/var/log`.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
}, },
{
"name": "logging.file.max-size",
"type": "org.springframework.util.unit.DataSize",
"description": "Maximum log file size. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": "10MB"
},
{
"name": "logging.file.max-history",
"type": "java.lang.Integer",
"description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": 7
},
{ {
"name": "logging.file.total-size-cap", "name": "logging.file.total-size-cap",
"type": "org.springframework.util.unit.DataSize", "type": "org.springframework.util.unit.DataSize",
@ -131,6 +154,15 @@
"description": "Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`.", "description": "Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
}, },
{
"name": "logging.path",
"type": "java.lang.String",
"description": "Location of the log file. For instance, `/var/log`.",
"deprecation": {
"replacement": "logging.file.path",
"level": "error"
}
},
{ {
"name": "logging.pattern.console", "name": "logging.pattern.console",
"type": "java.lang.String", "type": "java.lang.String",
@ -173,12 +205,74 @@
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": false "defaultValue": false
}, },
{
"name": "spring.application.index",
"type": "java.lang.Integer",
"description": "Application index.",
"deprecation": {
"level": "error",
"reason": "Application context ids are now unique by default."
}
},
{ {
"name": "spring.application.name", "name": "spring.application.name",
"type": "java.lang.String", "type": "java.lang.String",
"sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer", "sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer",
"description": "Application name." "description": "Application name."
}, },
{
"name": "spring.banner.charset",
"type": "java.nio.charset.Charset",
"description": "Banner file encoding.",
"defaultValue": "UTF-8"
},
{
"name": "spring.banner.image.bitdepth",
"type": "java.lang.Integer",
"description": "The bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).",
"defaultValue": 4
},
{
"name": "spring.banner.image.height",
"type": "java.lang.Integer",
"description": "Height of the banner image in chars (default based on image height)."
},
{
"name": "spring.banner.image.invert",
"type": "java.lang.Boolean",
"description": "Whether images should be inverted for dark terminal themes.",
"defaultValue": false
},
{
"name": "spring.banner.image.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner image file location (jpg or png can also be used).",
"defaultValue": "classpath:banner.gif"
},
{
"name": "spring.banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin in chars.",
"defaultValue": 2
},
{
"name": "spring.banner.image.pixelmode",
"type": "org.springframework.boot.ImageBanner$PixelMode",
"description": "The pixel mode to use when rendering the image.",
"defaultValue": "TEXT"
},
{
"name": "spring.banner.image.width",
"type": "java.lang.Integer",
"description": "Width of the banner image in chars.",
"defaultValue": 76
},
{
"name": "spring.banner.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner text resource location.",
"defaultValue": "classpath:banner.txt"
},
{ {
"name": "spring.beaninfo.ignore", "name": "spring.beaninfo.ignore",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
@ -192,6 +286,12 @@
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener", "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Config file locations used in addition to the defaults." "description": "Config file locations used in addition to the defaults."
}, },
{
"name": "spring.config.location",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Config file locations that replace the defaults."
},
{ {
"name": "spring.config.name", "name": "spring.config.name",
"type": "java.lang.String", "type": "java.lang.String",
@ -199,12 +299,6 @@
"description": "Config file name.", "description": "Config file name.",
"defaultValue": "application" "defaultValue": "application"
}, },
{
"name": "spring.config.location",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Config file locations that replace the defaults."
},
{ {
"name": "spring.jta.atomikos.connectionfactory.borrow-connection-timeout", "name": "spring.jta.atomikos.connectionfactory.borrow-connection-timeout",
"type": "java.lang.Integer", "type": "java.lang.Integer",
@ -709,18 +803,18 @@
"description": "Configures the ANSI output.", "description": "Configures the ANSI output.",
"defaultValue": "detect" "defaultValue": "detect"
}, },
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
},
{ {
"name": "spring.pid.fail-on-write-error", "name": "spring.pid.fail-on-write-error",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Fails if ApplicationPidFileWriter is used but it cannot write the PID file.", "description": "Fails if ApplicationPidFileWriter is used but it cannot write the PID file.",
"sourceType": "org.springframework.boot.context.ApplicationPidFileWriter" "sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
}, },
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
},
{ {
"name": "spring.profiles", "name": "spring.profiles",
"type": "java.util.List<java.lang.String>", "type": "java.util.List<java.lang.String>",
@ -752,100 +846,6 @@
"description": "Enable trace logs.", "description": "Enable trace logs.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": false "defaultValue": false
},
{
"name": "banner.charset",
"type": "java.nio.charset.Charset",
"description": "Banner file encoding.",
"defaultValue": "UTF-8",
"deprecation": {
"replacement": "spring.banner.charset",
"level": "error"
}
},
{
"name": "banner.image.height",
"type": "java.lang.Integer",
"description": "Banner image height (in chars).",
"deprecation": {
"replacement": "spring.banner.image.height",
"level": "error"
}
},
{
"name": "banner.image.invert",
"type": "java.lang.Boolean",
"description": "Invert images for dark console themes.",
"defaultValue": false,
"deprecation": {
"replacement": "spring.banner.image.invert",
"level": "error"
}
},
{
"name": "banner.image.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner image file location (jpg/png can also be used).",
"defaultValue": "banner.gif",
"deprecation": {
"replacement": "spring.banner.image.location",
"level": "error"
}
},
{
"name": "banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin (in chars).",
"deprecation": {
"replacement": "spring.banner.image.margin",
"level": "error"
}
},
{
"name": "banner.image.width",
"type": "java.lang.Integer",
"description": "Banner image width (in chars).",
"deprecation": {
"replacement": "spring.banner.image.width",
"level": "error"
}
},
{
"name": "banner.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner text resource location.",
"defaultValue": "classpath:banner.txt",
"deprecation": {
"replacement": "spring.banner.location",
"level": "error"
}
},
{
"name": "logging.file",
"type": "java.lang.String",
"description": "Log file name (for instance, `myapp.log`). Names can be an exact location or relative to the current directory.",
"deprecation": {
"replacement": "logging.file.name",
"level": "error"
}
},
{
"name": "logging.path",
"type": "java.lang.String",
"description": "Location of the log file. For instance, `/var/log`.",
"deprecation": {
"replacement": "logging.file.path",
"level": "error"
}
},
{
"name": "spring.application.index",
"type": "java.lang.Integer",
"description": "Application index.",
"deprecation": {
"level": "error",
"reason": "Application context ids are now unique by default."
}
} }
], ],
"hints": [ "hints": [
@ -857,7 +857,6 @@
"parameters": { "parameters": {
"group": false "group": false
} }
} }
] ]
}, },
@ -932,4 +931,3 @@
} }
] ]
} }