Commit Graph

24480 Commits

Author SHA1 Message Date
Stephane Nicoll
69c81189b6 Merge branch '2.1.x' into 2.2.x 2020-02-20 11:11:13 +01:00
Stephane Nicoll
5750b8d826 Start building against Reactor Californium-SR16 snapshots
See gh-20196
2020-02-20 11:10:11 +01:00
Stephane Nicoll
592ae85043 Merge branch '2.1.x' into 2.2.x 2020-02-20 11:03:10 +01:00
Stephane Nicoll
6aeff91f50 Polish 2020-02-20 10:58:37 +01:00
Andy Wilkinson
319ac968f6 Merge branch '2.1.x' into 2.2.x 2020-02-19 20:14:00 +00:00
Andy Wilkinson
29bc5d848e Start building against Spring Data Lovelace-SR16 snapshots
See gh-20198
2020-02-19 18:51:24 +00:00
Andy Wilkinson
5ae66d4c08 Start building against Spring Framework 5.1.14 snapshots
See gh-20197
2020-02-19 18:51:24 +00:00
Stephane Nicoll
7b190ecb88 Merge pull request #20222 from dreis2211
* pr/20222:
  Test the Gradle Plugin against Gradle 6.2

Closes gh-20222
2020-02-19 09:27:14 +01:00
dreis2211
d55bc5f850 Test the Gradle Plugin against Gradle 6.2
See gh-20222
2020-02-19 09:26:54 +01:00
Stephane Nicoll
d3535ca15f Merge pull request #20216 from hbellahc
* pr/20216:
  Document missing reference to DataSourceHealthIndicator

Closes gh-20216
2020-02-18 17:38:11 +01:00
hbellahc
d890f1f6d8 Document missing reference to DataSourceHealthIndicator
See gh-20216
2020-02-18 17:29:16 +01:00
Stephane Nicoll
1d60184075 Merge branch '2.1.x' into 2.2.x
Closes gh-20217
2020-02-18 16:58:46 +01:00
Stephane Nicoll
2147976c17 Do not fallback to embedded configuration if a datasource url is set
This commit makes sure that a fallback embedded datasource is not
created if no suitable connection pool is found and an url has been
explicitly registered.

This is consistent with EmbeddedDataSourceConfiguration as it is using
EmbeddedDatabaseBuilder behind the scenes and the latter does not
honour the configured URL anyway.

Closes gh-19192
2020-02-18 16:27:31 +01:00
Brian Clozel
e59d3fbb86 Clear ProducesRequestCondition cache attribute
As of spring-projects/spring-framework#22644, Spring Framework caches
the "produces" condition when matching for endpoints in the
`HandlerMapping` infrastructure. This has been improved in
spring-projects/spring-framework#23091 to prevent side-effects in other
implementations.

Prior to this commit, the Spring Boot actuator infrastructure for
`EndpointHandlerMapping` would not clear the cached attribute,
presenting the same issue as Spring Framework's infrastructure. This
means that a custom arrangement with custom `HandlerMapping` or
`ContentTypeResolver` would not work properly and reuse the cached
produced conditions for other, unintented, parts of the handler mapping
process.

This commit clears the cached data and ensures that other handler
mapping implementations are free of that side-effect.

Fixes gh-20150
2020-02-17 11:33:45 +01:00
Andy Wilkinson
bf8ed44453 Upgrade to Spring AMQP 2.2.4.RELEASE
Closes gh-20106
2020-02-15 13:14:04 +00:00
Madhura Bhave
4ac12660c6 Explicitly enable config properties scan in java release scripts
This commit also upgrades the Spring Boot version used by the scripts
to 2.2.4 which is why the explicit annotation is required.

Closes gh-20174
2020-02-14 13:46:56 -08:00
Andy Wilkinson
e065ee7be2 Merge branch '2.1.x' into 2.2.x
Closes gh-20183
2020-02-14 14:47:03 +00:00
Stephane Nicoll
7a114995b3 Merge pull request #20169 from juzerali
* pr/20169:
  Polish "Document sanitized keys and uri sanitization behavior"
  Document sanitized keys and uri sanitization behavior

Closes gh-20169
2020-02-14 15:30:05 +01:00
Stephane Nicoll
40d1727cc5 Polish "Document sanitized keys and uri sanitization behavior"
See gh-20169
2020-02-14 15:29:47 +01:00
Juzer Ali
30f7f9c9c4 Document sanitized keys and uri sanitization behavior
See gh-20169
2020-02-14 15:28:36 +01:00
Andy Wilkinson
c8907d46b4 Fix up-to-date checking of build info properties
Closes gh-20135
2020-02-14 11:56:19 +00:00
Stephane Nicoll
fc410f0572 Merge pull request #20168 from dsyer
* pr/20168:
  Remove duplicate auto-configuration class

Closes gh-20168
2020-02-14 10:26:03 +01:00
Dave Syer
dcaaf9785f Remove duplicate auto-configuration class
See gh-20168
2020-02-14 10:25:19 +01:00
Stephane Nicoll
2ede9e63b9 Merge branch '2.1.x' into 2.2.x
Closes gh-20117
2020-02-14 10:20:33 +01:00
Stephane Nicoll
32c1dd45a9 Revert "Merge pull request #19926 from xak2000"
Closes gh-19926
2020-02-14 10:18:02 +01:00
Stephane Nicoll
06c85e96c3 Merge branch '2.1.x' into 2.2.x
Closes gh-20159
2020-02-13 13:13:17 +01:00
Stephane Nicoll
41b054460b Merge pull request #20157 from dreis2211
* pr/20157:
  Upgrade CI to Docker 19.03.5

Closes gh-20157
2020-02-13 10:25:02 +01:00
dreis2211
e1f743a21b Upgrade CI to Docker 19.03.5
See gh-20157
2020-02-13 10:24:33 +01:00
dreis2211
92b4ba6367 Fix structuring your code link in multi-page HTML documentation
Closes gh-19953
2020-02-12 17:43:08 +00:00
Madhura Bhave
4eb71fc424 Merge branch '2.1.x' into 2.2.x 2020-02-11 19:43:19 -08:00
Madhura Bhave
97ac6c9de7 Polish 2020-02-11 19:41:54 -08:00
Madhura Bhave
98a657fedb Merge branch '2.1.x' into 2.2.x
Closes gh-20132
2020-02-11 19:02:19 -08:00
Madhura Bhave
8bce270445 Merge pull request #19202 from bono007
* pr/19202:
  Polish "Verify ssl key alias on server startup"
  Verify ssl key alias on server startup

Closes gh-19202
2020-02-11 17:09:05 -08:00
Madhura Bhave
ac91f14f05 Polish "Verify ssl key alias on server startup"
See gh-19202
2020-02-11 17:08:59 -08:00
cbono
e351605962 Verify ssl key alias on server startup
See gh-19202
2020-02-11 17:04:31 -08:00
Madhura Bhave
3bdd91a119 Merge branch '2.1.x' into 2.2.x 2020-02-11 14:57:49 -08:00
Madhura Bhave
747eab020d Update copyright of changed files 2020-02-11 14:57:17 -08:00
Madhura Bhave
d1c7699539 Merge branch '2.1.x' into 2.2.x
Closes gh-20129
2020-02-11 14:53:30 -08:00
Madhura Bhave
3917968d2a Merge pull request #18915 from schulzh
* pr/18915:
  Polish contribution
  Handle JSON keys containing a dot from CF environment as a single path segment

Closes gh-18915
2020-02-11 14:51:37 -08:00
Madhura Bhave
544dca7f1b Polish contribution
Along with surrounding map keys with dot from VCAP_SERVICES with `[ ]`,
this commit also does that for non-alphanumeric and `-` characters so that
they are not stripped off later.

See gh-18915
2020-02-11 14:50:55 -08:00
Hans Schulz
6828a15d31 Handle JSON keys containing a dot from CF environment as a single path segment
See gh-18915
2020-02-11 14:50:04 -08:00
Stephane Nicoll
8f06d819e4 Harmonize JMS connection factory bean names
This commit restores consistent naming for the auto-configured
connection factory.

Closes gh-19565
2020-02-11 16:23:56 +01:00
Stephane Nicoll
d1f4a1821c Merge branch '2.1.x' into 2.2.x
Closes gh-20123
2020-02-11 14:26:57 +01:00
Stephane Nicoll
b0aba9ed67 Document how to register a blocking health contributor with reactive
Closes gh-19707
2020-02-11 14:22:16 +01:00
Stephane Nicoll
fe6b96174e Merge branch '2.1.x' into 2.2.x
Closes gh-20122
2020-02-11 14:00:30 +01:00
Stephane Nicoll
06e5b0e912 Upgrade CI to Artifactory Resource 0.0.11
Closes gh-19629
2020-02-11 13:59:37 +01:00
Stephane Nicoll
765b2178d1 Document spring-boot.run.arguments behaviour with multiple arguments
Closes gh-19998
2020-02-11 13:39:10 +01:00
Stephane Nicoll
5f584101c6 Merge branch '2.1.x' into 2.2.x 2020-02-11 13:38:05 +01:00
Stephane Nicoll
2a90c3dea4 Fix broken smoke test
See gh-19926
2020-02-11 13:32:31 +01:00
Stephane Nicoll
1e43537212 Fix broken smoke test
See gh-19926
2020-02-11 11:56:52 +01:00