root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
31,259 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

12530 Commits

Author SHA1 Message Date
Madhura Bhave cfa26735d2 Merge programmatically set active profiles 
Update `Profiles` so that any profiles set programmatically on the
`Environment` are merged with `spring.profiles.active` properties.

Fixes gh-26151

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-05-17 13:29:12 -07:00
Andy Wilkinson 36b6235e86 Upgrade to Spring AMQP 2.2.17.RELEASE 
Closes gh-26428
 2021-05-17 18:02:53 +01:00
Andy Wilkinson 4eab9476a6 Polish "Detect use of spring.profiles.include as a YAML list" 
See gh-26205
 2021-05-17 14:13:29 +01:00
ChangYong 80ad6385f1 Detect use of spring.profiles.include as a YAML list 
See gh-26205
 2021-05-17 14:04:51 +01:00
Andy Wilkinson 1d5abf5af7 Merge branch '2.3.x' into 2.4.x 
Closes gh-26572
 2021-05-17 13:49:25 +01:00
Andy Wilkinson eecb7dd101 Remove stale jboss-transaction-spi dependencies 
Closes gh-26569
 2021-05-17 13:49:16 +01:00
Stephane Nicoll ef093bc9c6 Merge branch '2.3.x' into 2.4.x 
Closes gh-26570
 2021-05-17 14:24:03 +02:00
Stephane Nicoll 306b6f6999 Configure SessionCookieConfig in MockServletWebServer 
Closes gh-26479
 2021-05-17 14:05:45 +02:00
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x 
Closes gh-26525
 2021-05-17 11:48:34 +01:00
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies" 
See gh-25944
 2021-05-17 11:44:23 +01:00
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies 
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
 2021-05-17 11:29:36 +01:00
Andy Wilkinson 49d362fd7f Merge branch '2.3.x' into 2.4.x 
Closes gh-26523
 2021-05-17 11:27:46 +01:00
weixsun 7f445630e4 Remove unnecessary semicolon 
See gh-26446
 2021-05-17 11:26:57 +01:00
Andy Wilkinson 2a2c68f8f2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26521
 2021-05-17 11:22:48 +01:00
Andy Wilkinson be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance" 
See gh-26227
 2021-05-17 11:07:42 +01:00
Carlos Rafael de Oliveira Carneiro a6fa8addb9 Improve documentation of TestRestTemplate's fault tolerance 
See gh-26227
 2021-05-17 11:07:42 +01:00
Stephane Nicoll 87d986f9b8 Upgrade to Thymeleaf Layout Dialect 2.5.3 
Closes gh-26518
 2021-05-17 08:51:44 +02:00
Stephane Nicoll 7152c21641 Upgrade to R2DBC Bom Arabba-SR10 
Closes gh-26517
 2021-05-17 08:51:43 +02:00
Stephane Nicoll 6004835fd2 Upgrade to Postgresql 42.2.20 
Closes gh-26516
 2021-05-17 08:51:42 +02:00
Stephane Nicoll f84f9f347d Upgrade to Pooled JMS 1.2.2 
Closes gh-26515
 2021-05-17 08:51:40 +02:00
Stephane Nicoll 5efc9d5aa6 Upgrade to Netty tcNative 2.0.39.Final 
Closes gh-26514
 2021-05-17 08:51:39 +02:00
Stephane Nicoll 67b9aca437 Upgrade to Neo4j Java Driver 4.1.2 
Closes gh-26513
 2021-05-17 08:51:38 +02:00
Stephane Nicoll 35310b8f9b Upgrade to MySQL 8.0.25 
Closes gh-26512
 2021-05-17 08:51:37 +02:00
Stephane Nicoll d4c502e60c Upgrade to MariaDB 2.7.3 
Closes gh-26511
 2021-05-17 08:51:36 +02:00
Stephane Nicoll 0e1d107b82 Upgrade to Lettuce 6.0.5.RELEASE 
Closes gh-26510
 2021-05-17 08:51:35 +02:00
Stephane Nicoll f3f6294fe2 Upgrade to JUnit Jupiter 5.7.2 
Closes gh-26509
 2021-05-17 08:51:34 +02:00
Stephane Nicoll dc58916603 Upgrade to Json-smart 2.3.1 
Closes gh-26508
 2021-05-17 08:51:33 +02:00
Stephane Nicoll 4da1e1351a Upgrade to jOOQ 3.14.9 
Closes gh-26507
 2021-05-17 08:51:32 +02:00
Stephane Nicoll a4e71fb49f Upgrade to Johnzon 1.2.11 
Closes gh-26506
 2021-05-17 08:51:31 +02:00
Stephane Nicoll 496e3f1df9 Upgrade to Jetty 9.4.40.v20210413 
Closes gh-26505
 2021-05-17 08:51:30 +02:00
Stephane Nicoll 2718cfadd8 Upgrade to Jetty Reactive HTTPClient 1.1.8 
Closes gh-26504
 2021-05-17 08:51:29 +02:00
Stephane Nicoll 65b18acd81 Upgrade to JBoss Transaction SPI 7.6.1.Final 
Closes gh-26503
 2021-05-17 08:51:28 +02:00
Stephane Nicoll ef5476c764 Upgrade to Janino 3.1.4 
Closes gh-26502
 2021-05-17 08:51:27 +02:00
Stephane Nicoll 3cc04cf4a5 Upgrade to Infinispan 11.0.11.Final 
Closes gh-26501
 2021-05-17 08:51:26 +02:00
Stephane Nicoll 03a92fc632 Upgrade to Hibernate 5.4.31.Final 
Closes gh-26500
 2021-05-17 08:51:25 +02:00
Stephane Nicoll e7ac4f12f1 Upgrade to Ehcache3 3.9.3 
Closes gh-26499
 2021-05-17 08:51:24 +02:00
Stephane Nicoll 87fce0b480 Upgrade to Ehcache 2.10.9.2 
Closes gh-26498
 2021-05-17 08:51:23 +02:00
Stephane Nicoll 3b691a2bb1 Upgrade to Dropwizard Metrics 4.1.21 
Closes gh-26497
 2021-05-17 08:51:22 +02:00
Stephane Nicoll 316ad17856 Upgrade to ActiveMQ 5.16.2 
Closes gh-26496
 2021-05-17 08:51:21 +02:00
Stephane Nicoll 89be56d63c Upgrade to R2DBC Bom Arabba-SR10 
Closes gh-26494
 2021-05-17 07:46:34 +02:00
Stephane Nicoll 69ce28617c Upgrade to Postgresql 42.2.20 
Closes gh-26493
 2021-05-17 07:46:33 +02:00
Stephane Nicoll 626c21e7a1 Upgrade to Netty tcNative 2.0.39.Final 
Closes gh-26492
 2021-05-17 07:46:32 +02:00
Stephane Nicoll fc1d0af5d2 Upgrade to Neo4j OGM 3.2.22 
Closes gh-26491
 2021-05-17 07:46:32 +02:00
Stephane Nicoll a721493c88 Upgrade to MySQL 8.0.25 
Closes gh-26490
 2021-05-17 07:46:30 +02:00
Stephane Nicoll 5348a20ff5 Upgrade to Johnzon 1.2.11 
Closes gh-26489
 2021-05-17 07:46:29 +02:00
Stephane Nicoll bd73166023 Upgrade to Jetty 9.4.40.v20210413 
Closes gh-26488
 2021-05-17 07:46:28 +02:00
Stephane Nicoll ecbf7cb417 Upgrade to Jetty Reactive HTTPClient 1.1.8 
Closes gh-26487
 2021-05-17 07:46:27 +02:00
Stephane Nicoll 96e4dcc103 Upgrade to JBoss Transaction SPI 7.6.1.Final 
Closes gh-26486
 2021-05-17 07:46:26 +02:00
Stephane Nicoll 7739c3337d Upgrade to Janino 3.1.4 
Closes gh-26485
 2021-05-17 07:46:25 +02:00
Stephane Nicoll 48daeec522 Upgrade to Hibernate 5.4.31.Final 
Closes gh-26484
 2021-05-17 07:46:24 +02:00
Stephane Nicoll 7f51e43d60 Upgrade to Ehcache 2.10.9.2 
Closes gh-26483
 2021-05-17 07:46:23 +02:00
Stephane Nicoll ba863e4a5b Upgrade to Dropwizard Metrics 4.1.21 
Closes gh-26482
 2021-05-17 07:46:22 +02:00
Stephane Nicoll 5a71fa073e Upgrade to ActiveMQ 5.15.15 
Closes gh-26481
 2021-05-17 07:46:21 +02:00
Andy Wilkinson 3295b59563 Merge branch '2.3.x' into 2.4.x 
Closes gh-26473
 2021-05-15 08:56:09 +01:00
Andy Wilkinson 47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM 
Closes gh-26467
 2021-05-15 08:55:59 +01:00
Andy Wilkinson fbc629a8e7 Upgrade to Spring LDAP 2.3.4.RELEASE 
Closes gh-26393
 2021-05-15 08:48:24 +01:00
Andy Wilkinson f8bf09ff02 Upgrade to Spring LDAP 2.3.4.RELEASE 
Closes gh-25528
 2021-05-15 08:44:26 +01:00
Andy Wilkinson 77bb7f6139 Upgrade to Spring Data 2020.0.9 
Closes gh-26381
 2021-05-14 13:50:31 +01:00
Andy Wilkinson 9f279e0e96 Merge branch '2.3.x' into 2.4.x 
Closes gh-26462
 2021-05-14 13:45:29 +01:00
Andy Wilkinson 5984d4ee2b Index @ConfigurationProperties so they can be found by scanning 
Previously, @ConfigurationProperties was not annotated with @Indexed.
This meant that @ConfigurationPropertiesScan would not be able to
find them when the underlying
ClassPathScanningCandidateComponentProvider is using a
CandidateComponentsIndex.

This commit annotated @ConfigurationProperties with @Indexed so that
they can be found by index-based scanning.

Fixes gh-26459
 2021-05-14 13:41:24 +01:00
Andy Wilkinson c2ef7578e8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26460
 2021-05-14 11:41:24 +01:00
Andy Wilkinson 444474926c Configure JTA tests to write logs beneath build/ 
Closes gh-26440
 2021-05-14 11:40:43 +01:00
Phillip Webb 73131e99da Make BufferingApplicationStartup thread safe 
Update `BufferingApplicationStartup` to use thread safe data structures.

Prior to this commit, it was possible for calls from different threads
(for example due to request scope beans) to cause a
NoSuchElementException to be thrown.

Closes gh-25792
 2021-05-13 23:35:36 -07:00
Andy Wilkinson fd3d619670 Recommend default Servlet when using Jersey as a Filter 
Closes gh-25733
 2021-05-13 13:58:07 +01:00
Andy Wilkinson 970f933806 Merge branch '2.3.x' into 2.4.x 
Closes gh-26450
 2021-05-13 11:44:01 +01:00
Andy Wilkinson 2dd94b5554 Polish "Use try-with-resources statement" 
See gh-26449
 2021-05-13 11:37:10 +01:00
weixsun 5ba9db391f Use try-with-resources statements 
See gh-26449
 2021-05-13 11:36:14 +01:00
Scott Frederick 8ac297d6f3 Merge branch '2.3.x' into 2.4.x 
Closes gh-25839
 2021-05-12 14:57:40 -05:00
Scott Frederick 32d378a348 Use test harness for image building integration tests 
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
 2021-05-12 14:51:45 -05:00
Andy Wilkinson e5af3dbfc7 Upgrade to Spring HATEOAS 1.2.6 
Closes gh-26442
 2021-05-12 17:57:54 +01:00
Andy Wilkinson e29d2e208e Merge branch '2.3.x' into 2.4.x 2021-05-12 17:40:48 +01:00
Andy Wilkinson b3af6d6403 Polish 
See gh-25798
 2021-05-12 17:40:33 +01:00
Andy Wilkinson 322d6455db Upgrade to Micrometer 1.6.7 
Closes gh-26430
 2021-05-12 14:52:05 +01:00
Andy Wilkinson 7a2d5d4eee Upgrade to Spring Framework 5.3.7 
Closes gh-26360
 2021-05-12 14:51:33 +01:00
Andy Wilkinson ece845a4e0 Upgrade to Micrometer 1.5.14 
Closes gh-26427
 2021-05-12 14:09:27 +01:00
Andy Wilkinson 1a32a864d4 Upgrade to Spring Framework 5.2.15.RELEASE 
Closes gh-26425
 2021-05-12 11:30:57 +01:00
Stephane Nicoll efc0a7da44 Properly assert that auto-configured TaskExecutor is lazy 
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
 2021-05-12 07:34:58 +02:00
Madhura Bhave eff024b0ce Polish "Process additional profiles before config files processing" 
See gh-25817
 2021-05-11 15:04:34 -07:00
nguyensach 97fd9a7c77 Process additional profiles before config files processing 
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.

See gh-25817
 2021-05-11 15:03:36 -07:00
Stephane Nicoll c50afc69bd Upgrade to Reactor 2020.0.7 
Closes gh-26358
 2021-05-11 15:55:56 +02:00
Stephane Nicoll 526af5a790 Upgrade to Reactor Dysprosium-SR20 
Closes gh-26424
 2021-05-11 15:55:14 +02:00
Stephane Nicoll 21fbb2e79c Start building against Micrometer 1.6.7 snapshots 
See gh-26430
 2021-05-11 13:47:38 +02:00
Stephane Nicoll 5cdabc9729 Start building against Spring Kafka 2.5.13 snapshots 
See gh-26429
 2021-05-11 13:29:00 +02:00
Stephane Nicoll 47d5592035 Start building against Spring AMQP 2.2.17 snapshots 
See gh-26428
 2021-05-11 13:28:28 +02:00
Stephane Nicoll 3a8500126b Start building against Micrometer 1.5.14 snapshots 
See gh-26427
 2021-05-11 13:27:57 +02:00
Stephane Nicoll 9772867862 Start building against Spring Batch 4.2.7 snapshots 
See gh-26426
 2021-05-11 13:26:58 +02:00
Stephane Nicoll 66fe98eb3f Start building against Spring Framework 5.2.15 snapshots 
See gh-26425
 2021-05-11 10:05:47 +02:00
Stephane Nicoll c059759c4d Start building against Reactor Dysprosium-SR20 snapshots 
See gh-26424
 2021-05-11 10:05:00 +02:00
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots 
See gh-26393
 2021-05-10 09:38:41 +02:00
Stephane Nicoll 0d920894b7 Start building against Spring Batch 4.3.3 snapshots 
See gh-26391
 2021-05-10 09:03:43 +02:00
Stephane Nicoll 618475887c Start building against Spring Kafka 2.6.8 snapshots 
See gh-26385
 2021-05-10 09:03:14 +02:00
Stephane Nicoll 2479f69db1 Start building against Spring AMQP 2.3.7 snapshots 
See gh-26383
 2021-05-10 09:02:27 +02:00
Stephane Nicoll 05a3b9bbeb Start building against Spring Data 2020.0.9 snapshots 
See gh-26381
 2021-05-10 09:01:56 +02:00
Andy Wilkinson fe4d20c976 Merge branch '2.3.x' into 2.4.x 
Closes gh-26411
 2021-05-07 11:25:10 +01:00
Andy Wilkinson 6daf67a88c Upgrade to Gradle 6.9 
Closes gh-26408
 2021-05-07 11:21:24 +01:00
Stephane Nicoll 559af275a4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26405
 2021-05-07 09:14:35 +02:00
Sach Nguyen afa77b8253 Fix wrong reference to Cassandra in DockerImageNames#couchbase 
See gh-26399
 2021-05-07 09:12:43 +02:00
Phillip Webb efad44be43 Refine mandatory location checking logic 
Update `ConfigDataEnvironment.checkMandatoryLocations` to use the
actual locations that were imported, including those that were skipped
because the related `ConfigDataResource` had already been imported by a
different location.

Prior to this commit, any location that was skipped because it had
already been imported would throw a `ConfigDataNotFoundException`.

Closes gh-26147

Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
 2021-05-06 19:50:41 -07:00
Phillip Webb fef62f784a Import profile specific files in correct order 
Update `StandardConfigDataLoader` to mark profile specific files with
`Option.PROFILE` so that they are added in the correct order. This is
a variation of the same issue described in commit 5774ea3f0c.

Closes gh-26400

Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
 2021-05-06 19:43:40 -07:00
Scott Frederick 922517c0e5 Polish 2021-05-06 19:43:31 -07:00