Commit Graph

27490 Commits

Author SHA1 Message Date
Madhura Bhave
15cd590f7f Allow users to opt out of including the layer tools in a layered jar
For Maven, the layer configuration is now an additional configuration
option instead of a layout type.

Closes gh-19866
2020-02-19 17:28:27 -08:00
Andy Wilkinson
56475c19fb Merge branch '2.2.x' 2020-02-19 20:14:10 +00: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
Scott Frederick
6017c1ccac Update MongoDB auto-configuration documentation. 2020-02-19 12:39:57 -06:00
Scott Frederick
8f84dbe3cf Harmonize MongoDB client factories
This commit brings MongoClientFactory and ReactiveMongoClientFactory
into functional alignment and reduces duplication in the classes
and their tests.

There are no behavior changes to ReactiveMongoClientFactory.
MongoClientFactory now throws an exception when a URI is configured
along with a host, port, or credentials, where it previousy ignored
host, port, and credentials silently. MongClientFactory now also
supports MongoClientSettingsBuilderCustomizers.

Fixes gh-20019
2020-02-19 10:15:40 -06:00
Andy Wilkinson
d73366570a Merge pull request #20058 from dreis2211
* gh-20058:
  Polish "Include LICENCE and NOTICE files in shipped jars"
  Include LICENCE and NOTICE files in shipped jars

Closes gh-20058
2020-02-19 10:11:15 +00:00
Andy Wilkinson
8128f3090a Polish "Include LICENCE and NOTICE files in shipped jars"
See gh-20058
2020-02-19 10:11:02 +00:00
dreis2211
e34cf8955c Include LICENCE and NOTICE files in shipped jars
See gh-20058
2020-02-19 09:22:59 +00:00
Stephane Nicoll
fc3fb7fb44 Merge pull request #20226 from izeye
* pr/20226:
  Update copyright year of changed files
  Polish

Closes gh-20226
2020-02-19 09:35:47 +01:00
Stephane Nicoll
d65e06081f Update copyright year of changed files
See gh-20226
2020-02-19 09:35:28 +01:00
Johnny Lim
8be8a8421d Polish
See gh-20226
2020-02-19 09:34:46 +01:00
Stephane Nicoll
0c76c0acb9 Merge branch '2.2.x' 2020-02-19 09:27:24 +01: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
49c5d23b47 Merge pull request #20225 from mustafau
* pr/20225:
  Polish log4j2 configuration

Closes gh-20225
2020-02-19 09:19:15 +01:00
Mustafa Ulu
2760426db0 Polish log4j2 configuration
See gh-20225
2020-02-19 09:18:41 +01:00
Madhura Bhave
aa09058d8c Remove implicit layers support from the layer tools
Closes gh-20187
2020-02-18 16:23:25 -08:00
Andy Wilkinson
d8c309a310 Update gradlew.bat with Gradle 6.2's changes
See gh-20213
2020-02-18 17:09:07 +00:00
Stephane Nicoll
363edfa00c Merge branch '2.2.x'
Closes gh-20221
2020-02-18 17:38:39 +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
4ec30e1145 Add support for SimpleDriverDataSource
This commit makes sure that DataSourceBuilder can configure
SimpleDriverDataSource by adding an alias for the driver's class name.

Closes gh-20220

Co-authored-by: Dmytro Nosan <dimanosan@gmail.com>
2020-02-18 17:23:14 +01:00
Stephane Nicoll
287d577aea Merge branch '2.2.x'
Closes gh-20218
2020-02-18 16:59:52 +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
Andy Wilkinson
bca1b926ff Merge pull request #20213 from dreis2211
* gh-20213:
  Upgrade to Gradle 6.2

Closes gh-20213
2020-02-18 14:39:48 +00:00
dreis2211
866c441d70 Upgrade to Gradle 6.2
See gh-20213
2020-02-18 14:39:10 +00:00
Stephane Nicoll
16111f126e Use query-less datasource validation by default
This commit changes DataSourceHealthIndicator to validate the connection
rather than issuing a query to the database. If a custom validation
query is specified, it uses that as before.

Closes gh-17582
2020-02-18 14:59:06 +01:00
Stephane Nicoll
c53d4f2bf1 Merge pull request #20210 from dreis2211
* pr/20210:
  Fix duplicate words

Closes gh-20210
2020-02-18 13:38:34 +01:00
dreis2211
4f824bf9ad Fix duplicate words
See gh-20210
2020-02-18 13:34:56 +01:00
Andy Wilkinson
dcbbe20d41 Merge pull request #20193 from dreis2211
* gh-20193:
  Explicitly set java home in Maven Plugin integration tests

Closes gh-20193
2020-02-18 12:06:31 +00:00
dreis2211
76d2bc27eb Explicitly set java home in Maven Plugin integration tests
See gh-20193
2020-02-18 12:05:43 +00: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
Stephane Nicoll
d4c7315369 Merge pull request #19316 from eddumelendez
* pr/19316:
  Polish "Add support for configuring Liquibase tag property"
  Add support for configuring Liquibase tag property

Closes gh-19316
2020-02-17 09:56:53 +01:00
Stephane Nicoll
4bcf4245d1 Polish "Add support for configuring Liquibase tag property"
See gh-19316
2020-02-17 09:53:59 +01:00
Eddú Meléndez
407e237f10 Add support for configuring Liquibase tag property
See gh-19316
2020-02-17 09:46:42 +01:00
Stephane Nicoll
5cb24c2584 Merge pull request #20190 from mikesmithson
* pr/20190:
  Polish "Revisit PluginXmlParserTests"
  Revisit PluginXmlParserTests

Closes gh-20190
2020-02-17 09:37:08 +01:00
Stephane Nicoll
3ba411e04d Polish "Revisit PluginXmlParserTests"
See gh-20190
2020-02-17 09:36:15 +01:00
Mike Smithson
020ae2c7ba Revisit PluginXmlParserTests
See gh-20190
2020-02-17 09:20:16 +01:00
Stephane Nicoll
6a0cef8015 Merge pull request #20206 from dreis2211
* pr/20206:
  Remove redundant useJUnitPlatform declarations

Closes gh-20206
2020-02-17 09:16:18 +01:00
dreis2211
a9dabe13bb Remove redundant useJUnitPlatform declarations
See gh-20206
2020-02-17 09:15:57 +01:00
Stephane Nicoll
6fc25a309c Merge pull request #20192 from zhangt2333
* pr/20192:
  Update copyright date
  Polish

Closes gh-20192
2020-02-16 17:32:59 +01:00
Stephane Nicoll
03bee83991 Update copyright date
See gh-20192
2020-02-16 17:20:48 +01:00
zhangt2333
e2d87a89d0 Polish
See gh-20192
2020-02-16 17:19:18 +01:00
Andy Wilkinson
ff4de95b3e Merge branch '2.2.x' 2020-02-15 13:14:32 +00: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
0ec1ed4642 Merge branch '2.2.x'
Closes gh-20188
2020-02-14 13:51:27 -08: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