root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x

Browse Source 
Closes gh-21097
pull/21267/head
Stephane Nicoll 5 years ago
parent 81268914b4 291165f060
commit 311952730e
4 changed files with 1887 additions and 1867 deletions
Show Stats Download Patch File Download Diff File

932
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

2536
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
Unescape Escape View File

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

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

@ -7,57 +7,71 @@
],
"properties": [
{
"name": "spring.banner.charset",
"name": "banner.charset",
"type": "java.nio.charset.Charset",
"description": "Banner file encoding.",
"defaultValue": "UTF-8"
},
{
"name": "spring.banner.location",
"type": "org.springframework.core.io.Resource",
"description": "Banner text resource location.",
"defaultValue": "classpath:banner.txt"
},
{
"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"
"defaultValue": "UTF-8",
"deprecation": {
"replacement": "spring.banner.charset",
"level": "error"
}
},
{
"name": "spring.banner.image.width",
"name": "banner.image.height",
"type": "java.lang.Integer",
"description": "Width of the banner image in chars.",
"defaultValue": 76
"description": "Banner image height (in chars).",
"deprecation": {
"replacement": "spring.banner.image.height",
"level": "error"
}
},
{
"name": "spring.banner.image.height",
"type": "java.lang.Integer",
"description": "Height of the banner image in chars (default based on image height)."
"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": "spring.banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin in chars.",
"defaultValue": 2
"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": "spring.banner.image.invert",
"type": "java.lang.Boolean",
"description": "Whether images should be inverted for dark terminal themes.",
"defaultValue": false
"name": "banner.image.margin",
"type": "java.lang.Integer",
"description": "Left hand image margin (in chars).",
"deprecation": {
"replacement": "spring.banner.image.margin",
"level": "error"
}
},
{
"name": "spring.banner.image.bitdepth",
"name": "banner.image.width",
"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
"description": "Banner image width (in chars).",
"deprecation": {
"replacement": "spring.banner.image.width",
"level": "error"
}
},
{
"name": "spring.banner.image.pixelmode",
"type": "org.springframework.boot.ImageBanner$PixelMode",
"description": "The pixel mode to use when rendering the image.",
"defaultValue": "TEXT"
"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": "debug",
@ -95,6 +109,20 @@
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"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",
"type": "java.lang.String",
@ -107,20 +135,6 @@
"description": "Location of the log file. For instance, `/var/log`.",
"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",
"type": "org.springframework.util.unit.DataSize",
@ -191,12 +205,74 @@
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"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",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer",
"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",
"type": "java.lang.Boolean",
@ -211,17 +287,17 @@
"description": "Config file locations used in addition to the defaults."
},
{
"name": "spring.config.name",
"name": "spring.config.location",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Config file name.",
"defaultValue": "application"
"description": "Config file locations that replace the defaults."
},
{
"name": "spring.config.location",
"name": "spring.config.name",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Config file locations that replace the defaults."
"description": "Config file name.",
"defaultValue": "application"
},
{
"name": "spring.jta.atomikos.connectionfactory.borrow-connection-timeout",
@ -722,18 +798,18 @@
"description": "Configures the ANSI output.",
"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",
"type": "java.lang.Boolean",
"description": "Fails if ApplicationPidFileWriter is used but it cannot write the PID file.",
"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",
"type": "java.util.List<java.lang.String>",
@ -765,82 +841,6 @@
"description": "Enable trace logs.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"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": "spring.application.index",
"type": "java.lang.Integer",
"description": "Application index.",
"deprecation": {
"level": "error",
"reason": "Application context ids are now unique by default."
}
}
],
"hints": [
@ -852,7 +852,6 @@
"parameters": {
"group": false
}
}
]
},
@ -927,4 +926,3 @@
}
]
}

Write Preview
Loading…
Cancel
Save