Commit Graph

9447 Commits

Author SHA1 Message Date
Phillip Webb 49921d65ac Ensure @ActiveProfiles replaces existing profiles
Update `SpringBootContextLoader` to both add `spring.profiles.active`
properties and to directly call `Environment.setActiveProfiles`.
The additional `setActiveProfiles` call prevents `AbstractEnvironment`
from accidentally loading `spring.profiles.active` properties directly
when `doGetActiveProfiles` is called.

Directly setting active profiles has only become necessary since we
started adding properties using the square bracket notation. Previously
we added a comma-separated list which would be picked up by both the
`AbstractEnvironment` and the `ConfigurationFileApplicationListener`.

Closes gh-21302
2020-05-08 17:16:06 -07:00
Scott Frederick 28749e7fbb Update CNB buildpack Java version env variable
Prior to this commit, the build tool plugins set the environment
variable BP_JAVA_VERSION when invoking the CNB builder to set the
version of the JDK/JRE that the builder should use in the created
image.

With CNB API 0.3, the convention changed the name of this environment
variable to BP_JVM_VERSION. This commit updates the build tool
plugins to match the newer convention.

See gh-21273
2020-05-08 17:07:51 -05:00
Scott Frederick 35bc82a693 Use CNB creator all-in-one lifecycle
This commit modifies the buildpack platform invocation logic used by
the build plugins to invoke the single creator lifecycle introduced in
the CNB API 0.3, instead of invoking discrete lifecycle phases
separately. It also removes support for CNB API 0.2.

Fixes gh-21273
2020-05-08 17:03:47 -05:00
Stephane Nicoll d067cc6ae2 Merge branch '2.2.x'
Closes gh-21367
2020-05-08 16:58:01 +02:00
Stephane Nicoll c3eaa6dc54 Merge branch '2.1.x' into 2.2.x
Closes gh-21366
2020-05-08 16:57:41 +02:00
Stephane Nicoll efc9978362 Document use case of splitting auto-configuration and starter
Closes gh-20686
2020-05-08 16:55:47 +02:00
Johnny Lim 665a127448 Fix JarFileTests.getInputStreamWhenClosed()
See gh-21365
2020-05-08 16:06:42 +02:00
Stephane Nicoll 846db6105f Merge branch '2.2.x'
Closes gh-21364
2020-05-08 14:51:49 +02:00
Stephane Nicoll 60ff8bafb5 Polish "Align TestRestTemplate Javadoc with documentation"
See gh-21318
2020-05-08 14:49:50 +02:00
Andrii Hrytsiuk f11c030b71 Align TestRestTemplate Javadoc with documentation
See gh-21318
2020-05-08 14:48:21 +02:00
dreis2211 71c8d5cda1 Update link to new Spring Security docs location
See gh-21040
2020-05-08 14:29:22 +02:00
Phillip Webb 7afd25fc9a Add ConfigurationPropertyCaching support
Add a `ConfigurationPropertyCaching` utility interface that can be
used to control the property source caching.

Prior to this commit, a `ConfigurationPropertySource` that was backed
by a mutable `EnumerablePropertySource` would need to call the
`getPropertyNames()` method each time a property was accessed. Since
this this operation can be expensive, we now provide a way to cache
the results for a specific length of time.

This commit also improves the performance of immutable property sources
by limiting the number of candidates that need to be searched.
Previously, all mapped names would be enumerated. Now, mappings are
grouped by `ConfigurationPropertyName`. This is especially helpful when
the `ConfigurationPropertyName` isn't mapped at all since the hash based
map lookup will be very fast and the resulting mappings will be empty.

Closes gh-20625
2020-05-07 15:22:24 -07:00
Phillip Webb 85e9a73e85 Add hashcode support to ConfigurationPropertyName
Provide a hashcode implementation for `ConfigurationPropertyName` so
that instances can be stored in Map without them all ending up in the
same bucket.

See gh-20625
2020-05-07 15:22:20 -07:00
Phillip Webb 5309912927 Test large property source performance
Add a test to ensure that a large number of property sources that each
contain many items can perform well.

See gh-20625
2020-05-07 15:22:10 -07:00
Phillip Webb 81058cab03 Allow clash in spring.config.name
Remove the recently added slash restriction since Spring Cloud
Config Server needs to support names with slashes.

See gh-21217
2020-05-07 07:56:01 -07:00
Phillip Webb 559c178637 Simplify regex expressions 2020-05-07 07:44:31 -07:00
Stephane Nicoll 09815cc99d Merge branch '2.2.x'
Closes gh-21352
2020-05-07 14:19:41 +02:00
Stephane Nicoll 31f9a965f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21351
2020-05-07 14:12:53 +02:00
Stephane Nicoll 1a4f6df0a3 Upgrade to Spring Ldap 2.3.3.RELEASE
Closes gh-21342
2020-05-07 14:11:24 +02:00
Stephane Nicoll 3ac38fd65e Upgrade to Spring Security 5.3.2.RELEASE
Closes gh-21349
2020-05-07 09:50:25 +02:00
Stephane Nicoll 55a1cd4a34 Upgrade to Spring Security 5.2.4.RELEASE
Closes gh-21348
2020-05-07 09:41:38 +02:00
Stephane Nicoll 66afe280cb Upgrade to Spring Security 5.1.10.RELEASE
Closes gh-21346
2020-05-07 09:32:15 +02:00
Madhura Bhave 8e7f816f48 Merge branch '2.2.x'
Closes gh-21344
2020-05-06 16:37:25 -07:00
Madhura Bhave 5583f64b1f Add tests to verify Jetty's thread pool defaults match server defaults
Closes gh-21213
2020-05-06 16:35:00 -07:00
Madhura Bhave 01404aa27b Merge branch '2.2.x'
Closes gh-21343
2020-05-06 16:00:24 -07:00
Madhura Bhave f29bce657e Harmonize default for server.tomcat.use-relative-redirects
Prior to this commit, the property was a Boolean with a null default.
If it was explicitly set by the user, a context customizer would use
that value to set it on the context. However, if it was not set, the default
wouldn't be tomcat's default but `false` because it was explicitly set to
`false` in `TomcatServletWebServerFactory`. This commit defaults the property
itself to `false` so that the default is more obvious to the user.

Fixes gh-20796
2020-05-06 15:54:27 -07:00
Madhura Bhave be7fe85b55 Polish 2020-05-06 15:35:44 -07:00
Phillip Webb b4963d2463 Fix legacy environment names in isAncestorOf
Fix the `SystemEnvironmentPropertyMapper.isAncestorOf` implementation
to convert names based on their dashed form and to silently ignore
any invalid results.

Closes gh-14479
2020-05-06 11:35:39 -07:00
Andy Wilkinson 70c4baeef6 Merge branch '2.2.x'
Closes gh-21341
2020-05-06 17:34:48 +01:00
Andy Wilkinson 386d678d99 Use Gradle's CreateStartScripts task with 6.4 and later
Fixes gh-20759
2020-05-06 17:02:34 +01:00
Andy Wilkinson 693fa918e2 Tolerate deprecation warnings generated by Gradle 6.4
The warnings will be addressed by gh-20759. CreateBootStartScripts
must be excluded from the classes that are validated by the
ValidatePlugins task. It is invalid, but only for Gradle 6.4. gh-20759
will cause it to only be used with Gradle 6.3 and earlier.

See gh-21329
2020-05-06 15:33:11 +01:00
Stephane Nicoll addaf5ff18 Upgrade to Jetty El 8.5.54
Closes gh-21340
2020-05-06 16:09:23 +02:00
Stephane Nicoll 4dc9aa082f Upgrade to Hibernate 5.4.15.Final
Closes gh-21339
2020-05-06 16:09:23 +02:00
Stephane Nicoll 5bb26bf9db Upgrade to Johnzon Jsonb 1.2.5
Closes gh-21338
2020-05-06 16:09:22 +02:00
Stephane Nicoll cd7048315d Upgrade to Byte Buddy 1.10.10
Closes gh-21337
2020-05-06 16:09:22 +02:00
Stephane Nicoll f4d007222f Upgrade to Dropwizard Metrics 4.1.7
Closes gh-21336
2020-05-06 16:09:22 +02:00
Stephane Nicoll 51740133c3 Upgrade to Saaj Impl 1.5.2
Closes gh-21335
2020-05-06 16:09:17 +02:00
Stephane Nicoll 30a48d55c4 Upgrade to Okhttp3 3.14.8
Closes gh-21334
2020-05-06 15:33:37 +02:00
Stephane Nicoll 5be1f67936 Upgrade to Hazelcast 3.12.7
Closes gh-21333
2020-05-06 15:33:36 +02:00
Stephane Nicoll 938a99bb21 Upgrade to Jackson 2.10.4
Closes gh-21332
2020-05-06 15:33:35 +02:00
Stephane Nicoll 293cd6edb9 Upgrade to Jetty El 8.5.54
Closes gh-21331
2020-05-06 15:21:58 +02:00
Stephane Nicoll 6c8f0a0082 Upgrade to Hibernate 5.3.17.Final
Closes gh-21330
2020-05-06 15:21:56 +02:00
Stephane Nicoll 02aacf4f04 Upgrade to Gradle 6.4
Closes gh-21329
2020-05-06 15:03:50 +02:00
Andy Wilkinson e03cb94190 Merge branch '2.2.x'
Closes gh-21327
2020-05-06 12:55:08 +01:00
Andy Wilkinson 9ba78db865 Allow Undertow to stop when a request is being handled
Previously, unlike embedded Jetty, Netty, and Tomcat, Undertow would
not stop when one of its worker threads was in use. This meant that a
a long-running or stalled request could prevent the application from
shutting down in response to SIGTERM or SIGINT, and SIGTERM would be
required to get the process to exit.

This commit updates the factories for the reactive and servlet
Undertow web server factories to configure Undertow to use a 0ms
shutdown timeout. This aligns it with the behaviour of Jetty, Netty,
and Tomcat. Tests have been introduced to verify the behaviour across
the reactive and servlet variants of all four supported embedded web
servers.

Fixes gh-21319
2020-05-06 12:23:37 +01:00
Andy Wilkinson 1bc41ec336 Stop developmentOnly from removing too much from executable jars and wars
Fixes gh-21288
2020-05-06 09:45:35 +01:00
Phillip Webb 5ae623c43a Polish 'Add Period converter support'
Polish period converter support, primarily by changing
`PeriodStyle` to parse and print periods that include
more than one unit.

See gh-21136
2020-05-06 00:21:50 -07:00
Grubhart dc4d71f91e Add Period converter support
Add converter support for `javax.time.Period` including:

	String -> Period
	Number -> Period
	Period -> String

Period to Number conversion is not supported since `Period` has no
ability to deduce the number of calendar days in the period.

See gh-21136
2020-05-05 22:31:49 -07:00
Madhura Bhave a8f56b57cb Consider legacy environment names in isAncestorOf
Update the `isAncestorOf` method of SpringConfigurationPropertySources
so that legacy names are considered for the system environment.

Prior to this commit, binding a property such as `my.camelCase.prop`
would detect `MY_CAMELCASE_PROP` but not `MY_CAMEL_CASE_PROP` in
the system environment.

Fixes gh-14479

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2020-05-05 21:36:11 -07:00
Phillip Webb 4a8492d428 Further optimize StringSequence.startsWith
See gh-21259
2020-05-05 18:37:10 -07:00
dreis2211 70ffc70993 Optimize StringSequence.startsWith
See gh-21259
2020-05-05 18:37:10 -07:00
Madhura Bhave 7634901fb3 Return null when getting a logback logger that does not exist
Closes gh-21292
2020-05-05 17:07:51 -07:00
Madhura Bhave f23d0501e4 Merge branch '2.2.x'
Closes gh-21323
2020-05-05 14:14:24 -07:00
Madhura Bhave 43e7ccd620 Detect log4j2-test.* files when using log4J2
Fixes gh-17001
2020-05-05 14:12:34 -07:00
Phillip Webb 3325709a78 Upgrade to JNA 5.5.0
Upgrade JNA to 5.5.0 and only use the jna-platform dependency.

Closes gh-21313
2020-05-05 12:50:33 -07:00
Phillip Webb 365f65d214 Merge branch '2.2.x'
Closes gh-21321
2020-05-05 12:12:54 -07:00
Phillip Webb 98d27db767 Merge branch '2.1.x' into 2.2.x
Closes gh-21320
2020-05-05 12:12:31 -07:00
Phillip Webb df70c42f98 Allow classpath wildcards with Java 11 or above
Update `StaticResourceJars` to catch both `IOException` and
`InvalidPathException` when checking URLs. Prior to this commit only
`IOException` was caught which worked on Java 8 but not Java 11 or
above.

Fixes gh-21312
2020-05-05 12:10:31 -07:00
Phillip Webb 720d23af41 Further restrict configuration wildcard patterns
Extend wildcard restrictions to the `spring.config.name` property. Also
refine exception messages to include the property value.

Closes gh-21217
2020-05-05 10:27:35 -07:00
Katada, Junya bc2a83062b Fix duplicate slashes in URL links
See gh-21108
2020-05-05 17:48:49 +02:00
Andy Wilkinson f6d8c7d23c Simplify ReactiveWebServerApplicationContext.ServerManager
Closes gh-21315
2020-05-05 15:04:09 +01:00
Andy Wilkinson a688ac3f64 Improve testing of ReactiveWebServerApplicationContext
Closes gh-21314
2020-05-05 12:45:24 +01:00
Kyle Hoehns fd46002666 Fix typo for includeLayerTools
See gh-21310
2020-05-04 17:29:28 -07:00
Andy Wilkinson e484246388 Add missing implementation attributes to Shade config
Fixes gh-21304
2020-05-04 15:58:33 +01:00
Andy Wilkinson de1e3c6069 Include empty layers when listing and extracting
Fixes gh-21301
2020-05-04 15:50:55 +01:00
Stephane Nicoll f4ae2b0584 Merge branch '2.2.x'
Closes gh-21305
2020-05-04 14:58:43 +02:00
Stephane Nicoll 8abf658087 Remove dependency management for the Wavefront SDK
Closes gh-21295
2020-05-04 10:17:01 +02:00
Phillip Webb 9486842bad Merge branch '2.2.x'
Closes gh-21294
2020-05-01 18:31:14 -07:00
Phillip Webb 92ef515fbe Fix @DefaultValue PropertyEditor based conversion
Update `ValueObjectBinder` reattempt conversion if the `@DefaultValue`
contains a single element. Prior to this commit, single element
conversion relied on the `ArrayToObjectConverter` which isn't always
available.

Fixes gh-21264
2020-05-01 18:26:18 -07:00
Phillip Webb 07415e1603 Attempt to fix Windows CI test failure 2020-04-30 18:17:29 -07:00
Phillip Webb 57179c0d3d Add InputStreamSourceToByteArrayConverter
Add an `InputStreamSourceToByteArrayConverter` that can be used to
convert from an `InputStreamSource` (such as a `Resource`) to a
byte array.

Closes gh-21285
2020-04-30 16:40:05 -07:00
Phillip Webb d52bf83ab2 Polish 2020-04-30 16:40:05 -07:00
Madhura Bhave 8ec16bd027 Restrict wildcard pattern support for configuration files
This commit restricts how wildcards can be used in search
locations for property files. If a search location contains
a pattern, there must be only one '*' and the location should
end with a '*/'. For search locations that specify the file
name, the pattern should end with '*/<filename>'.

The list of files read from wildcard locations are now sorted
alphabetically according to the absolute path of the file.

Closes gh-21217
2020-04-30 14:17:44 -07:00
Andy Wilkinson 79a2e7f469 Upgrade to Undertow 2.1.0.Final
Closes gh-21278
2020-04-30 20:18:11 +01:00
Andy Wilkinson 1f00938c5a Upgrade to SAAJ Impl 1.5.2
Closes gh-21277
2020-04-30 20:18:11 +01:00
Andy Wilkinson a361583c8c Upgrade to Jetty EL 8.5.54
Closes gh-21276
2020-04-30 19:46:48 +01:00
Andy Wilkinson a7fd02e243 Upgrade to Hazelcast 3.12.7
Closes gh-21275
2020-04-30 19:46:46 +01:00
Andy Wilkinson 2b76f837b4 Upgrade to Byte Buddy 1.10.10
Closes gh-21274
2020-04-30 19:46:45 +01:00
Andy Wilkinson 04c7132eb3 Rename customize to reflect type that it customizes
See gh-20961
2020-04-30 19:43:52 +01:00
Scott Frederick 1c11e163c7 Fix Maven plugin command-line examples
Fixes gh-21078
2020-04-30 12:19:14 -05:00
Andy Wilkinson 83e4bb39b6 Add transaction auto-configuration to @DataMongoTest
Closes gh-20182
2020-04-30 15:05:23 +01:00
Stephane Nicoll 52fbf47e7f Upgrade to Flyway 6.4.1
Closes gh-21269
2020-04-30 15:35:48 +02:00
Stephane Nicoll 6051a27bd7 Upgrade to Spring Integration 5.2.6
Closes gh-20950
2020-04-30 15:24:19 +02:00
Stephane Nicoll 5292b3a693 Upgrade to Spring Integration 5.1.10
Closes gh-20941
2020-04-30 15:22:41 +02:00
dreis2211 dd11b8adba Fix checkstyle violation
See gh-21266
2020-04-30 12:43:51 +02:00
Andy Wilkinson 1abe0f16d0 Apply gridFsDatabase to auto-configured ReactiveGridFsTemplate
Closes gh-18284
2020-04-30 10:46:10 +01:00
Madhura Bhave 6007a71b9c Polish "Add support for customizing RSocketMessageHandler"
See gh-21081
2020-04-29 17:15:09 -07:00
Aarti Gupta 456d6e78fe Add support for customizing RSocketMessageHandler
See gh-21081
2020-04-29 17:11:19 -07:00
Scott Frederick 0cb090766f Fix typos in mock tests data 2020-04-29 18:08:34 -05:00
Scott Frederick a30740f8d2 Separate server properties for message and errors
Prior to this commit, there was a property server.error.include-details
that allowed configuration of the message and errors attributes in a
server error response.

This commit separates the control of the message and errors attributes
into two separate properties named server.error.include-message and
server.error.include-binding-errors. When the message attribute is
excluded from a servlet response, the value is changed from a
hard-coded text value to an empty value.

Fixes gh-20505
2020-04-29 17:56:47 -05:00
Andy Wilkinson d65d951318 Polish "Add support for customizing Spring Session's cookie serializer"
See gh-20961
2020-04-29 20:53:58 +01:00
Vedran Pavic 32454b83b4 Add support for customizing Spring Session's cookie serializer
This commit introduces a CookieSerializerCustomizer callback that
allows the customization of the auto-configured
DefaultCookieSerializer bean. This is particularly useful for
configuring cookie serializer's capabilities, such as SameSite, that
are not supported by the Servlet API and therefore not exposed via
server.servlet.session.cookie.* properties.

See gh-20961
2020-04-29 20:53:58 +01:00
Scott Frederick f3d717e97a Use paketo-buildpacks/builder as default builder
This commit changes the default builder image from
`cloudfoundry/cnb:bionic-platform-api-0.2` to
`gcr.io/paketo-buildpacks/builder:base-platform-api-0.3`. It also
uses a `paketo-buildpacks/builder` image instead of a
`cloudfoundry/cnb` image to test compatibility with lifecycle v2
and uses paketo naming instead of cloudfoundry when mocking builder
interactions.

Some adjustments to lifecycle phases were also made to align more
closely with the pack CLI.

Fixes gh-21066
2020-04-29 14:28:25 -05:00
Andy Wilkinson 14c88b3c04 Upgrade to Spring Integration 5.3.0.RC1
Closes gh-20951
2020-04-29 20:21:49 +01:00
Andy Wilkinson c7a5b72565 Improve compatibility by replacing use of seq with a native for-loop
Closes gh-21068
2020-04-29 19:30:35 +01:00
Andy Wilkinson 76d71e58d7 Upgrade to Spring Kafka 2.5.0.RC1
Closes gh-20953
2020-04-29 19:06:35 +01:00
Stephane Nicoll d16074d8fd Bind and unbind Kafka metrics as consumers and producers come and go
Fixes gh-21008

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2020-04-29 17:53:08 +01:00
Brian Clozel 692a8c47cc Rename property for registering default Servlet
As a follow-up for gh-21214, this commit renames the property to:

`"server.servlet.register-default-servlet=false"`

Closes gh-21214
2020-04-29 18:42:50 +02:00
Brian Clozel c7c01f8ab4 Add property for registering default Servlet
This commit adds a new configuration property for configuring the
registration of the default Servlet in Servlet containers.

`"server.servlet.default-servlet.registered=false"`

The default of this property is still `true`, as it's been the case in
previous releases.

Closes gh-21214
2020-04-29 18:02:33 +02:00
Andy Wilkinson 2d769e7679 Polish "Stop limiting layer customization to external modules"
See gh-21207
2020-04-29 14:22:43 +01:00
Paddy Drury 98644df64d Stop limiting layer customization to external modules
See gh-21207
2020-04-29 14:22:43 +01:00
dreis2211 c1c90b11b8 Fix some deprecations
See gh-21212
2020-04-29 15:10:30 +02:00
Stephane Nicoll 2eef71cba5 Upgrade to Spring AMQP 2.2.6
Closes gh-20947
2020-04-29 15:08:49 +02:00
Stephane Nicoll 371774c109 Upgrade to WebJars Locator Core 0.45
Closes gh-21255
2020-04-29 14:34:51 +02:00
Stephane Nicoll 2807e64e73 Upgrade to Tomcat 9.0.34
Closes gh-21254
2020-04-29 14:34:50 +02:00
Stephane Nicoll b042af606f Upgrade to Spring WS 3.0.9.RELEASE
Closes gh-21253
2020-04-29 14:34:49 +02:00
Stephane Nicoll 2b969d07d7 Upgrade to SendGrid 4.4.8
Closes gh-21252
2020-04-29 14:34:48 +02:00
Stephane Nicoll 0e2eb69be5 Upgrade to Selenium HtmlUnit 2.39.0
Closes gh-21251
2020-04-29 14:34:47 +02:00
Stephane Nicoll b74d80bed9 Upgrade to Rabbit AMQP Client 5.9.0
Closes gh-21250
2020-04-29 14:34:45 +02:00
Stephane Nicoll 2f5f8f9a34 Upgrade to OkHttp3 3.14.8
Closes gh-21249
2020-04-29 14:34:44 +02:00
Stephane Nicoll 584a8476ee Upgrade to Netty 4.1.49.Final
Closes gh-21248
2020-04-29 14:34:43 +02:00
Stephane Nicoll 4c8c316f88 Upgrade to Neo4j OGM 3.2.11
Closes gh-21247
2020-04-29 14:34:42 +02:00
Stephane Nicoll 98eb325dec Upgrade to MySQL 8.0.20
Closes gh-21246
2020-04-29 14:34:41 +02:00
Stephane Nicoll b1c0b487b9 Upgrade to MongoDB 4.0.2
Closes gh-21245
2020-04-29 14:34:40 +02:00
Stephane Nicoll 3437de0736 Upgrade to Log4j2 2.13.2
Closes gh-21244
2020-04-29 14:34:39 +02:00
Stephane Nicoll 6843b424f3 Upgrade to Liquibase 3.8.9
Closes gh-21243
2020-04-29 14:34:38 +02:00
Stephane Nicoll a8171e4bac Upgrade to JUnit Jupiter 5.6.2
Closes gh-21241
2020-04-29 14:34:35 +02:00
Stephane Nicoll 7df2ab6550 Upgrade to Jetty 9.4.28.v20200408
Closes gh-21240
2020-04-29 14:34:34 +02:00
Stephane Nicoll 5dd58650a2 Upgrade to Jackson Bom 2.11.0
Closes gh-21239
2020-04-29 14:34:33 +02:00
Stephane Nicoll fa5ae5eb7f Upgrade to InfluxDB Java 2.18
Closes gh-21238
2020-04-29 14:34:32 +02:00
Stephane Nicoll 74d6d1d1f2 Upgrade to Infinispan 10.1.6.Final
Closes gh-21237
2020-04-29 14:34:30 +02:00
Stephane Nicoll 613eab764f Upgrade to HtmlUnit 2.39.1
Closes gh-21236
2020-04-29 14:34:29 +02:00
Stephane Nicoll b3f47dc461 Upgrade to HikariCP 3.4.3
Closes gh-21235
2020-04-29 14:34:28 +02:00
Stephane Nicoll f492c8de40 Upgrade to Hibernate Validator 6.1.4.Final
Closes gh-21234
2020-04-29 14:34:27 +02:00
Stephane Nicoll cf48c73b7f Upgrade to Hibernate 5.4.14.Final
Closes gh-21233
2020-04-29 14:34:26 +02:00
Stephane Nicoll d9f18f4930 Upgrade to Groovy 2.5.11
Closes gh-21232
2020-04-29 14:34:25 +02:00
Stephane Nicoll d0be0586a7 Upgrade to Glassfish JAXB 2.3.3
Closes gh-21231
2020-04-29 14:34:24 +02:00
Stephane Nicoll 987404eef8 Upgrade to Flyway 6.3.3
Closes gh-21230
2020-04-29 14:34:22 +02:00
Stephane Nicoll fe1962ad75 Upgrade to Flatten Maven Plugin 1.2.2
Closes gh-21229
2020-04-29 14:34:21 +02:00
Stephane Nicoll 33f1557115 Upgrade to Dropwizard Metrics 4.1.6
Closes gh-21228
2020-04-29 14:34:19 +02:00
Stephane Nicoll 6a83b4d9da Upgrade to Couchbase Client 3.0.3
Closes gh-21227
2020-04-29 14:34:18 +02:00
Stephane Nicoll f3f298d2ad Upgrade to Cassandra Driver 4.6.0
Closes gh-21226
2020-04-29 14:34:16 +02:00
Stephane Nicoll b3f2ff8c16 Upgrade to Caffeine 2.8.2
Closes gh-21225
2020-04-29 14:34:15 +02:00
Stephane Nicoll daa71d1e67 Upgrade to Artemis 2.12.0
Closes gh-21224
2020-04-29 14:34:14 +02:00
Stephane Nicoll a13ebcba88 Upgrade to AppEngine SDK 1.9.80
Closes gh-21223
2020-04-29 14:34:13 +02:00
Stephane Nicoll 2ca5eebd25 Upgrade to Spring Kafka 2.3.8
Closes gh-20952
2020-04-29 14:24:17 +02:00
Stephane Nicoll 8e999a4a9e Upgrade to Spring AMQP 2.2.6
Closes gh-20946
2020-04-29 14:23:38 +02:00
Stephane Nicoll 3e6b62b043 Upgrade to Spring Kafka 2.2.13
Closes gh-20988
2020-04-29 14:20:59 +02:00
Stephane Nicoll 524d316500 Upgrade to Spring AMQP 2.1.14
Closes gh-20939
2020-04-29 14:20:39 +02:00
Stephane Nicoll a18a6e1058 Upgrade to Glassfish Jaxb 2.3.3
Closes gh-21195
2020-04-29 14:12:58 +02:00
Andy Wilkinson d167bb472d Allow base packages to be specified on @AutoConfigurationPackage
Closes gh-19023
2020-04-29 13:00:22 +01:00
Stephane Nicoll ee913503b4 Tolerate Hazelcast 4
This commit updates HazelcastHealthIndicator and
HazelcastCacheMeterBinderProvider so that they work with
Hazelcast 4 while retaining compatibility with Hazelcast 3. Reflection
is used when necessary.

This commit also adds a smoke test that validates those features are
working when Hazelcast 4 is on the classpath.

Closes gh-21169
2020-04-29 13:39:54 +02:00
Andy Wilkinson d63e492906 Add support for enabling ISO date, time, and date-time formatting
Closes gh-20579
2020-04-29 11:47:33 +01:00
Andy Wilkinson 95e5d4e045 Polish "Enable users to provide custom time and datetime formats"
See gh-18772
2020-04-29 11:46:56 +01:00
Daniel Knittl-Frank 69b51cd64d Enable users to provide custom time and datetime formats
Extend WebFlux and WebMvc properties with timeFormat and
dateTimeFormat properties to allow users to customize format of
LocalTime and LocalDateTime instances.

See gh-18772
2020-04-29 11:46:24 +01:00
Stephane Nicoll 6921fdacac Expand configuration class eager filtering to imports
Previously, only root auto-configuration classes could be excluded
eagerly via an AutoConfigurationImportFilter. Any configuration class
loaded as a result of processing a particular auto-configuration were
parsed and checked as usual.

This commit makes use of the `getExclusionFilter` callback to expand
this filter to all candidates that are considered. The annotation
processor has also be expanded to generate metadata for non-root
configuration classes.

Closes gh-12157
2020-04-29 10:45:28 +02:00
Stephane Nicoll 0cbc5a78c7 Upgrade to Micrometer 1.5.0
Closes gh-20833
2020-04-29 10:40:24 +02:00
Andy Wilkinson 69a25e4d80 Stop relying on transitive com.nimbusds:oauth2-oidc-sdk dependency 2020-04-29 09:17:57 +01:00
Andy Wilkinson 77f1e37ade Add dependency management for OAuth2 OIDC SDK
Closes gh-20974
2020-04-29 09:16:53 +01:00
Phillip Webb ad1248e4ec Replace "folder" with "directory"
Consistently use the term "directory" instead of "folder"

Closes gh-21218
2020-04-28 19:20:24 -07:00
Brian Clozel ec871d6752 Fix StatusAggregator static initialization
Prior to this commit, there was a cycle between `StatusAggregator` and
`SimpleStatusAggregator`, which caused a static initialization bug -
depending on which class (the implementation or its interface) was
loaded first.

This commit turns the static field of the `StatusAggregator` interface
into a static method to avoid this problem.

Fixes gh-21211
2020-04-28 21:01:14 +02:00
Stephane Nicoll ea5f282e9b Upgrade to Spring Data Neumann-RC2
Closes gh-20949
2020-04-28 15:44:49 +02:00
Stephane Nicoll f24c215a0b Upgrade to Spring HATEOAS 1.1.0.RC1
Closes gh-21210
2020-04-28 15:44:16 +02:00
Stephane Nicoll 5f253ead76 Upgrade to Spring Framework 5.2.6
Closes gh-20945
2020-04-28 15:43:37 +02:00
Stephane Nicoll 673af8d1d9 Upgrade to Spring Data Moore-SR7
Closes gh-20948
2020-04-28 15:41:35 +02:00
Stephane Nicoll 76740db9a5 Upgrade to Spring HATEOAS 1.0.5.RELEASE
Closes gh-21209
2020-04-28 15:40:51 +02:00
Stephane Nicoll ca458c2666 Upgrade to Spring Data Lovelace-SR17
Closes gh-20940
2020-04-28 15:38:02 +02:00
Stephane Nicoll 9e88af9703 Upgrade to Spring Data Lovelace-SR17
Closes gh-20940
2020-04-28 15:36:16 +02:00
Stephane Nicoll 5dc82eda53 Upgrade to Spring Framework 5.1.15
Closes gh-20938
2020-04-28 15:35:08 +02:00
Andy Wilkinson 76ad465f77 Upgrade to Solr 8.5.1
Closes gh-21206
2020-04-28 11:03:41 +01:00
Andy Wilkinson e49e4c2d83 Upgrade to Lettuce 5.3.0.RELEASE
Closes gh-21096
2020-04-28 11:02:46 +01:00
dreis2211 4b0a31acf8 Delete Toml class
See gh-21129
2020-04-28 11:01:00 +01:00
Brian Clozel dac62476a0 Merge branch '2.2.x'
Closes gh-21208
2020-04-28 11:33:50 +02:00
Brian Clozel a63ab468a3 Upgrade to RSocket 1.0.0-RC7
This commit upgrades to RSocket 1.0.0-RC7.
This new RC brings API changes we have to adapt to. As of this commit,
we're introducing a new `RSocketServerCustomizer` which replaces the now
deprecated `ServerRSocketFactoryProcessor`.

Closes gh-21046
2020-04-28 11:09:37 +02:00
Stephane Nicoll 6ff7b81239 Upgrade to Spring Ws 3.0.9.RELEASE
Closes gh-21205
2020-04-28 10:02:49 +02:00
Stephane Nicoll 47c26ef69d Upgrade to Spring Security 5.2.3.RELEASE
Closes gh-21204
2020-04-28 10:02:49 +02:00
Stephane Nicoll 4cc45f964c Upgrade to Spring Batch 4.2.2.RELEASE
Closes gh-21203
2020-04-28 10:02:49 +02:00
Stephane Nicoll 423ec71d45 Upgrade to Postgresql 42.2.12
Closes gh-21202
2020-04-28 10:02:49 +02:00
Stephane Nicoll 65fc43865a Upgrade to Neo4j Ogm 3.2.11
Closes gh-21201
2020-04-28 10:02:49 +02:00
Stephane Nicoll cacdfa443f Upgrade to Liquibase 3.8.9
Closes gh-21200
2020-04-28 10:02:49 +02:00
Stephane Nicoll f621ac61fa Upgrade to Kotlin 1.3.72
Closes gh-21199
2020-04-28 10:02:49 +02:00
Stephane Nicoll f45fd47a34 Upgrade to Infinispan 9.4.19.Final
Closes gh-21198
2020-04-28 10:02:49 +02:00
Stephane Nicoll 51cedc6225 Upgrade to Hibernate Validator 6.0.19.Final
Closes gh-21197
2020-04-28 10:02:49 +02:00
Stephane Nicoll 5668bf456a Upgrade to Hibernate 5.4.14.Final
Closes gh-21196
2020-04-28 10:02:49 +02:00
Stephane Nicoll e822c497ef Upgrade to Elasticsearch 6.8.8
Closes gh-21194
2020-04-28 09:28:33 +02:00
Stephane Nicoll 6182d83f8c Upgrade to Jetty 9.4.28.v20200408
Closes gh-21193
2020-04-28 09:28:31 +02:00
Stephane Nicoll e88ee06b5b Upgrade to Groovy 2.5.11
Closes gh-21192
2020-04-28 09:28:30 +02:00
Stephane Nicoll 7820f0115a Upgrade to Tomcat 9.0.34
Closes gh-21191
2020-04-28 09:28:29 +02:00
Stephane Nicoll 5027a05b0e Upgrade to Johnzon Jsonb 1.2.4
Closes gh-21190
2020-04-28 09:28:28 +02:00
Stephane Nicoll c7d0928114 Upgrade to Byte Buddy 1.10.9
Closes gh-21189
2020-04-28 09:28:27 +02:00
Stephane Nicoll e82bd7f3a1 Upgrade to Mysql 8.0.20
Closes gh-21188
2020-04-28 09:28:25 +02:00
Stephane Nicoll 32f128bb9f Upgrade to Joda Time 2.10.6
Closes gh-21187
2020-04-28 09:28:24 +02:00
Stephane Nicoll 09fb95bd6d Upgrade to Netty 4.1.49.Final
Closes gh-21186
2020-04-28 09:28:23 +02:00
Stephane Nicoll 13edf342f6 Upgrade to Micrometer 1.3.8
Closes gh-21185
2020-04-28 09:28:22 +02:00
Stephane Nicoll c8b2440afb Upgrade to Dropwizard Metrics 4.1.6
Closes gh-21184
2020-04-28 09:28:21 +02:00
Stephane Nicoll 0fb174e54c Upgrade to Hikaricp 3.4.3
Closes gh-21183
2020-04-28 09:28:19 +02:00
Stephane Nicoll 732a51a898 Upgrade to Sendgrid 4.4.8
Closes gh-21182
2020-04-28 09:28:18 +02:00
Stephane Nicoll 8fb2ea4e65 Upgrade to Appengine Sdk 1.9.80
Closes gh-21181
2020-04-28 09:28:17 +02:00
Stephane Nicoll 8831856d79 Upgrade to Caffeine 2.8.2
Closes gh-21180
2020-04-28 09:28:16 +02:00
Stephane Nicoll fb6fcff198 Upgrade to Couchbase Client 2.7.14
Closes gh-21179
2020-04-28 09:28:15 +02:00
Phillip Webb 50e9674631 Backport "Attempt to prevent JarFiles from being left open"
Update `JarFile` so that `super.close()` is called early so that the
file is not left open. Since we re-implement `JarFile` methods to work
directly on the underlying `RandomAccessDataFile`, it should be safe
to close immediately.

Closes gh-21177
2020-04-27 19:03:52 -07:00
Phillip Webb 6fe30a8a7e Merge branch '2.2.x'
Closes gh-21175
2020-04-27 16:20:36 -07:00
Phillip Webb 36b082e8c1 Merge branch '2.1.x' into 2.2.x
Closes gh-21174
2020-04-27 16:18:55 -07:00
Phillip Webb e2705b2cfd Throw exception if classpath*: is used
Update `ConfigFileApplicationListener` to throw a better exception if
`classpath*:` is used as a location.

Closes gh-21168
2020-04-27 13:42:40 -07:00
Andy Wilkinson fb33610027 Automatically create developmentOnly configuration
Previously, the developmentOnly configuration, typically used for
Devtools, had to be declared manually. The BootJar and BootWar tasks
then had a property, excludeDevtools, that could be used to control
whether or not Devtools would be excluded from the executable archive.

This commit updates the reaction to the Java plugin being applied to
automatically create the developmentOnly configuration. The classpaths
of bootJar and bootWar are then configured not to include the contents
of the developmentOnly configuration. As a result of this, the
excludeDevtools property is no longer needed and has been deprecated.
Its default has also been changed from true to false to make it easy
to opt in to Devtools, when configured as a development-only
dependency, being included in executable jars and wars by adding
developmentOnly to the classpath of the archive task.

Closes gh-16599
2020-04-27 13:38:14 +01:00
Stephane Nicoll cbdc5d9746 Upgrade to Reactor Bom Dysprosium-SR7
Closes gh-20943
2020-04-27 14:33:14 +02:00
Stephane Nicoll 0761ff1f0b Upgrade to Reactor Bom Dysprosium-SR7
Closes gh-20942
2020-04-27 14:30:20 +02:00
Stephane Nicoll 16005c608f Upgrade to Reactor Bom Californium-SR18
Clsoes gh-20937
2020-04-27 14:28:43 +02:00
Brian Clozel dfdee3e00e Revert "Add support for Reactor Netty Micrometer metrics"
This commit removes the support for Reactor Netty metrics since it
seems that Spring Boot should not use this feature:

* HTTP metrics are already covered by WebFlux
* TCP metrics are only meant to TCP server/clients
* allocator metrics are already provided by Netty and there is
no specific API to enable them here.

Closes gh-19388
2020-04-27 12:06:26 +02:00
Stephane Nicoll 4165863859 Polish contribution
See gh-21130
2020-04-27 10:41:02 +02:00
richard1230 a989879dbc Polish
See gh-21130
2020-04-27 10:38:40 +02:00
dreis2211 c7d7facc3a Remove empty test rule package
See gh-21137
2020-04-27 10:32:44 +02:00
Stephane Nicoll 3ea0b4198b Upgrade to Maven Dependency Plugin 3.1.2
Closes gh-21167
2020-04-27 09:38:51 +02:00
Stephane Nicoll a7e3257e7f Upgrade to Xmlunit2 2.6.4
Closes gh-21166
2020-04-27 09:38:50 +02:00
Stephane Nicoll cac0407762 Upgrade to Spring Ws 3.0.9.RELEASE
Closes gh-21165
2020-04-27 09:38:49 +02:00
Stephane Nicoll 4e93115b05 Upgrade to Spring Session Bom Bean-SR10
Closes gh-21164
2020-04-27 09:38:48 +02:00
Stephane Nicoll 0697b3acb4 Upgrade to Spring Security 5.1.9.RELEASE
Closes gh-21163
2020-04-27 09:38:47 +02:00
Stephane Nicoll f24351d12a Upgrade to Spring Batch 4.1.4.RELEASE
Closes gh-21162
2020-04-27 09:38:46 +02:00
Stephane Nicoll c3c5b444e7 Upgrade to Postgresql 42.2.12
Closes gh-21161
2020-04-27 09:38:45 +02:00
Stephane Nicoll 25fb48d0e3 Upgrade to Neo4j Ogm 3.1.19
Closes gh-21160
2020-04-27 09:38:44 +02:00
Stephane Nicoll 067a07386a Upgrade to Mimepull 1.9.13
Closes gh-21159
2020-04-27 09:38:43 +02:00
Stephane Nicoll e6b17bc5b8 Upgrade to Infinispan 9.4.19.Final
Closes gh-21158
2020-04-27 09:38:41 +02:00
Stephane Nicoll 9bb16e44b0 Upgrade to Hibernate Validator 6.0.19.Final
Closes gh-21157
2020-04-27 09:38:40 +02:00
Stephane Nicoll 191a4e5a51 Upgrade to Hibernate 5.3.16.Final
Closes gh-21156
2020-04-27 09:38:39 +02:00
Stephane Nicoll 19826847d4 Upgrade to Freemarker 2.3.30
Closes gh-21155
2020-04-27 09:38:38 +02:00
Stephane Nicoll 46fe25480c Upgrade to Jetty 9.4.28.v20200408
Closes gh-21154
2020-04-27 09:38:37 +02:00
Stephane Nicoll ce4001c54b Upgrade to Janino 3.0.16
Closes gh-21153
2020-04-27 09:38:36 +02:00
Stephane Nicoll a9a3845168 Upgrade to Groovy 2.5.11
Closes gh-21152
2020-04-27 09:38:35 +02:00
Stephane Nicoll a01b0b7145 Upgrade to Tomcat 9.0.34
Closes gh-21151
2020-04-27 09:38:34 +02:00
Stephane Nicoll 4a51a8be2a Upgrade to Solr 7.7.3
Closes gh-21150
2020-04-27 09:38:33 +02:00
Stephane Nicoll a336f29ce2 Upgrade to Httpclient 4.5.12
Closes gh-21149
2020-04-27 09:38:32 +02:00
Stephane Nicoll 72e3d71067 Upgrade to Activemq 5.15.12
Closes gh-21148
2020-04-27 09:38:31 +02:00
Stephane Nicoll c0398e190a Upgrade to Mysql 8.0.20
Closes gh-21147
2020-04-27 09:38:30 +02:00
Stephane Nicoll d63d2075fa Upgrade to Joda Time 2.10.6
Closes gh-21146
2020-04-27 09:38:29 +02:00
Stephane Nicoll 671f3c2075 Upgrade to Undertow 2.0.30.Final
Closes gh-21145
2020-04-27 09:38:28 +02:00
Stephane Nicoll d1821b3895 Upgrade to Rxjava2 2.2.19
Closes gh-21144
2020-04-27 09:38:27 +02:00
Stephane Nicoll b29d2eedc8 Upgrade to Netty Tcnative 2.0.30.Final
Closes gh-21143
2020-04-27 09:38:25 +02:00
Stephane Nicoll 8a02bac617 Upgrade to Netty 4.1.49.Final
Closes gh-21142
2020-04-27 09:38:24 +02:00
Stephane Nicoll effa0cb024 Upgrade to Micrometer 1.1.13
Closes gh-21141
2020-04-27 09:38:23 +02:00
Stephane Nicoll 4ea31a2d2e Upgrade to Appengine Sdk 1.9.80
Closes gh-21140
2020-04-27 09:38:22 +02:00
Stephane Nicoll 4c3880427a Upgrade to Jackson 2.9.10.20200411
Closes gh-21139
2020-04-27 09:38:21 +02:00
Stephane Nicoll 0c4efffaa7 Upgrade to Couchbase Client 2.7.14
Closes gh-21138
2020-04-27 09:38:20 +02:00
Brian Clozel 956afdcf97 Add support for Reactor Netty Micrometer metrics
This commit enables the production of TCP and buffer allocator metrics
for Reactor Netty, client and server.

When applications use auto-configured server
(`NettyReactiveWebServerFactory`) and client (through
`WebClient.Builder`) instances, metrics will be enabled.

Note that HTTP metrics are not enabled here, since similar metrics are
already produced at the WebFlux level. Also, to avoid cardinality
explosion of metrics (through the URI tag), Reactor Netty offers
configurable infrastructure to deduplicate URI tags by turning expanded
URI instances into templated URIs. This is not targeted for Spring
usage.

Closes gh-19388
2020-04-26 22:10:39 +02:00
Brian Clozel b337f67f93 Add ReactorNettyHttpClientMapper
This new customizer-like interface make it possible to configure the
Reactor Netty `HttpClient` that is going to be used by the
`WebClient.Builder` provided by Spring Boot.

Closes gh-21135
2020-04-26 22:10:39 +02:00
Brian Clozel 8f84147f37 Fix deprecations after Reactor Netty upgrade 2020-04-26 22:10:39 +02:00
Phillip Webb 77b9dd900c Merge branch '2.2.x'
See gh-21127
2020-04-25 22:21:23 -07:00
Phillip Webb 7d53f7d27f Attempt to prevent JarFiles from being left open
Update `JarFile` to also call `super.close()` early for nested jars.

See gh-21126
2020-04-25 22:20:53 -07:00
Phillip Webb 4f47b7b46a Merge branch '2.2.x'
See gh-21127
2020-04-25 13:32:43 -07:00
Phillip Webb 7c6e912463 Attempt to prevent JarFiles from being left open
Update `JarFile` so that `super.close()` is called early so that the
file is not left open. Since we re-implement `JarFile` methods to work
directly on the underlying `RandomAccessDataFile`, it should be safe
to close immediately.

See gh-21126
2020-04-25 13:03:07 -07:00
Stephane Nicoll 85a3fcfb5e Merge branch '2.2.x'
Closes gh-21119
2020-04-25 09:32:24 +02:00
Stephane Nicoll 80410997ec Polish "Enhance Database initialization how to guide"
See gh-21077
2020-04-25 09:30:58 +02:00
nikmanzotti f2b10be01e Enhance Database initialization how to guide
See gh-21077
2020-04-25 09:30:43 +02:00
Stephane Nicoll 961be0fea3 Merge branch '2.2.x'
Closes gh-21118
2020-04-25 09:15:49 +02:00
dreis2211 e3a9bacf3b Fix typo
See gh-21002
2020-04-25 09:14:01 +02:00
dreis2211 54f319acd5 Remove unused method
See gh-21117
2020-04-25 09:07:13 +02:00
Johnny Lim ef567388c1 Polish
See gh-21110
2020-04-25 09:04:10 +02:00
dreis2211 848127ae49 Avoid recompiling pattern in Handler#canonicalize
See gh-21103
2020-04-25 09:02:21 +02:00
dreis2211 c2fb95151b Fix link to R2DBC Query in docs
See gh-21079
2020-04-25 09:00:58 +02:00
dreis2211 667033c149 Fix Actuator API PDF name
See gh-21054
2020-04-25 08:59:00 +02:00
Stephane Nicoll c7baf5fda1 Update copyright year of changed file
See gh-21009
2020-04-25 08:55:27 +02:00
dreis2211 5eb5bf0a2d Polish
See gh-21009
2020-04-25 08:54:47 +02:00
Stephane Nicoll 85e9f713b0 Update copyright year of changed files
See gh-21007
2020-04-25 08:50:51 +02:00
Johnny Lim 29717423a3 Remove this keyword on member method invocations
See gh-21007
2020-04-25 08:49:44 +02:00
Mikael c06edbe6f4 Polish ApplicationHome
See gh-20992
2020-04-25 08:44:37 +02:00
Andy Wilkinson 076a384c9c Merge branch '2.2.x'
Closes gh-21112
2020-04-24 18:10:00 +01:00
Andy Wilkinson 29dc236bb2 Broaden deprecation warning check in Gradle Plugin's tests
Closes gh-21111
2020-04-24 17:45:42 +01:00
Andy Wilkinson d5b944140a Attempt to stabilise CouchbaseAutoConfigurationIntegrationTests
Starting the CouchbaseContainer fails intermittently when creation
of the primary index for the bucket fails with a read timeout. The
test doesn't require a primary index for the bucket so this commit
disables it creation in the hope that it will help to stabilise the
test.
2020-04-24 16:21:08 +01:00
Andy Wilkinson dc75ca3942 Avoid capturing TCCL when creating DefaultResourceLoaders
Previously, DefaultResourceLoader instances were created using the
default constructor. This causes the resource loader to capture the
TCCL that was in place at that time. This can lead to a class loader
leak if the resource loader is referenced directly or indirectly from
a static field of a class loaded by a different class loader.

This commit updates the creation of DefaultResourceLoader instances
in main code so that the resource load will use the class loader of
the creating class. In almost all cases this will be the same class
loader as was the thread context class loader that was being captured
so the change in behavior is minimal. Crucially, it will still address
the situation where the TCCL was different.

Note the DevTools' ApplicationContextResourceLoader has been updated
to explicitly use the TCCL. This ensures that it uses the restart
class loader which is required for DevTools to function correctly.

Fixes gh-20900
2020-04-24 13:29:29 +01:00
Andy Wilkinson d53be18582 Deprecate support for Bitronix
Closes gh-20823
2020-04-24 11:37:44 +01:00
Phillip Webb 6ccba24494 Merge branch '2.2.x'
Close gh-20507 in 2.3.0.RC1
2020-04-23 16:40:49 -07:00
Phillip Webb 581ce09f88 Merge branch '2.1.x' into 2.2.x
Closes gh-21106
2020-04-23 16:39:38 -07:00
Phillip Webb 416cfc2c86 Improve @Value documentation
Improve "@ConfigurationProperties vs. @Value" documentation with the
recommendation that kebab-case is used with the `@Value` annotation.

Closes gh-20507
2020-04-23 16:39:22 -07:00
Phillip Webb db28c0c65c Backport "Attempt to fix CI" 2020-04-23 16:35:01 -07:00
Phillip Webb 4de69c380d Attempt to fix CI 2020-04-23 15:55:10 -07:00
dreis2211 1be8312886 Fix PropertiesMigrationListenerTests
See gh-21104
2020-04-23 14:53:03 -07:00
Phillip Webb 49345025ac Merge branch '2.2.x'
Closes gh-21105
2020-04-23 14:44:08 -07:00
Phillip Webb 93f7e2b6ba Limit when PortInUseException is thrown
Refactor `PortInUseException` logic to a single place and refine when
the exception is thrown.

Prior to this commit, we assumed that a `BindException` was only thrown
when the port was in use. In fact, it's possible that the exception
could be thrown because the requested address "could not be assigned".

We now only throw a `PortInUserException` if the `BindException` message
includes the phrase "in use".

Fixes gh-21101
2020-04-23 14:42:30 -07:00
Phillip Webb b73d5038d5 Merge branch '2.2.x' 2020-04-23 14:35:08 -07:00
Phillip Webb 9bb53a4c37 Polish 2020-04-23 14:31:49 -07:00
Scott Frederick 8f5ef951de Use current timestamp for index files with Gradle
This commit removes changes the timestamp used when writing the
classpath and layers index files in the Gradle plugin to be the
current timestamp unless `preserveFileTimestamps=true`. It also
polishes some duplication in the handling of entry attributes
when creating the fat archive and adds a test to verify that
the Gradle plugin uses the same fixed timestamp constant as
Gradle uses internally.

See gh-21005
2020-04-23 16:05:32 -05:00
Madhura Bhave b3ccefdb57 Merge branch '2.2.x'
Closes gh-21102
2020-04-23 10:19:10 -07:00
Madhura Bhave 4dc9bbe127 @SpringBootTest classes with different args shouldn't share a context
Fixes gh-20866
2020-04-23 10:18:14 -07:00
Stephane Nicoll ddcd1bc7bb Remove metadata for configuration keys that were removed in 2.0
Closes gh-19706
2020-04-23 16:14:13 +02:00
Stephane Nicoll 623fbcbf8c Polish 2020-04-23 15:20:47 +02:00
Stephane Nicoll 1019dbbc47 Merge branch '2.2.x'
Closes gh-21100
2020-04-23 15:00:22 +02:00
Stephane Nicoll 8ac3ab5551 Add missing metadata for removed configuration keys
Closes gh-20846
2020-04-23 14:39:10 +02:00
Stephane Nicoll 6c02daf2bc Merge branch '2.2.x'
Closes gh-21098
2020-04-23 14:12:37 +02:00
Stephane Nicoll 311952730e Merge branch '2.1.x' into 2.2.x
Closes gh-21097
2020-04-23 14:07:31 +02:00
Stephane Nicoll 291165f060 Order additional metadata according to lexicographic order
Closes gh-21095
2020-04-23 13:58:49 +02:00
Andy Wilkinson d05c973e71 Polish 2020-04-23 11:49:07 +01:00
Stephane Nicoll fe90b2a251 Rename Service Level Agreement to Service Level Objective
This commit harmonizes our integration of Micrometer's Service Level
objectives.

Closes gh-21076
2020-04-23 10:13:17 +02:00
Phillip Webb 48821bccb7 Merge branch '2.2.x'
Closes gh-21092
2020-04-22 16:50:41 -07:00
Phillip Webb d1649fbb9a Merge branch '2.1.x' into 2.2.x
Closes gh-21091
2020-04-22 16:49:33 -07:00
Phillip Webb e0f94f54ac Add "Health as Gauge" how-to documentation
Add how-to documentation describing how health information can be
exported to a Micrometer Gauge.

Closes gh-18329
2020-04-22 16:45:46 -07:00
Madhura Bhave 21bb249a73 Merge branch '2.2.x'
Closes gh-21090
2020-04-22 14:36:36 -07:00
Madhura Bhave b9c2b7b257 Prevent early initialization in MockitoPostProcessor
Fixes gh-20665
2020-04-22 14:35:50 -07:00
Phillip Webb 3e3587e0fb Polish 2020-04-22 12:57:08 -07:00
Phillip Webb 56711d678a Merge branch '2.2.x'
Closes gh-21083
2020-04-22 11:59:22 -07:00
Phillip Webb 102729b5e1 Merge branch '2.1.x' into 2.2.x
Closes gh-21082
2020-04-22 11:58:39 -07:00
Phillip Webb b3d33754a5 Remove outdated FIXMEs from tests
Closes gh-19782
2020-04-22 11:55:35 -07:00
Andy Wilkinson ab82e59aa1 Polish "Improve property name in thrown Micrometer ValidationException"
See gh-21069
2020-04-22 10:16:38 +01:00
Jon Schneider 507b062c43 Improve property name in thrown Micrometer ValidationException
See gh-21069
2020-04-22 10:03:50 +01:00
Stephane Nicoll f0fe7060df Polish 2020-04-22 10:47:18 +02:00
Phillip Webb bf41da5322 Update copyright year of changed files 2020-04-21 18:12:27 -07:00
Phillip Webb ed7a5db174 Fail operations when JarFile is closed
Update `JarFile` to track when the instance has been closed and throw
an exception in the same way that `ZipFile` does.

Closes gh-21072
2020-04-21 18:12:03 -07:00
Phillip Webb cc33e23d31 Merge branch '2.2.x'
Closes gh-21074
2020-04-21 17:22:11 -07:00
Phillip Webb 6bf933205c Merge branch '2.1.x' into 2.2.x
Fixes gh-21073
2020-04-21 17:21:32 -07:00
Madhura Bhave 0699116e95 Merge branch '2.2.x'
Closes gh-21075
2020-04-21 17:11:05 -07:00
Madhura Bhave 16ac968f69 Relocate section on configuring DevTools' file system watcher
Closes gh-20895
2020-04-21 17:09:40 -07:00
Scott Frederick fa186aa15b Preserve timestamps on loader directories
Prior to this commit, when the Maven plugin copied
spring-boot-loader.jar to a repackaged archive the timestamps of class
files were preserved but the timestamps of directories were not
preserved. This resulted in the directories having a current timestamp.

This commit copies the directory timestamps from spring-boot-loader.jar
to the repackaged archive and adds tests to verify the proper
behavior.

See gh-20927
2020-04-21 18:58:34 -05:00