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
28,920 Commits 23 Branches 348 Tags 291 MiB
Commit Graph

28920 Commits

Author SHA1 Message Date
Stephane Nicoll 7d984d7f89 Merge branch '2.3.x' 
Closes gh-23453
 2020-09-22 16:45:32 +02:00
Stephane Nicoll 3adf06df17 Merge branch '2.2.x' into 2.3.x 
Closes gh-23452
 2020-09-22 16:45:08 +02:00
Stephane Nicoll 2999f09a40 Rework tip on templates location in the IDE 
This commit rework the tip on locating templates when running the app
in the IDE. Using classpath* should not change anything as this won't
make a difference without a pattern in the path.

Closes gh-23068
 2020-09-22 16:44:16 +02:00
Stephane Nicoll 1258bce57a Add bomr exclusion for Apache Solr 8.6+ 
Closes gh-23370
 2020-09-22 15:42:14 +02:00
Andy Wilkinson 659b459fab Make the auto-configured LocaleContextResolver conditional on missing bean 
Closes gh-23419
 2020-09-22 14:35:05 +01:00
Stephane Nicoll 20193715f9 Merge branch '2.3.x' 2020-09-22 15:21:32 +02:00
Stephane Nicoll 531690b8e1 Merge branch '2.2.x' into 2.3.x 
Closes gh-23448
 2020-09-22 15:21:04 +02:00
Stephane Nicoll 7f84a92ef1 Document that Java 15 is supported 
Closes gh-23447
 2020-09-22 15:19:47 +02:00
Stephane Nicoll 1631ae23f5 Allow RestTemplateBuilder to be further customized 
Closes gh-23389
 2020-09-22 14:07:43 +02:00
Stephane Nicoll a7c411609e Merge branch '2.3.x' 2020-09-22 10:10:56 +02:00
Stephane Nicoll 37ded9f6d3 Merge branch '2.2.x' into 2.3.x 
Closes gh-23446
 2020-09-22 10:10:24 +02:00
Stephane Nicoll 9b8866c45c Merge pull request #23445 from dreis2211 
* pr/23445:
  Fix multi-release JAR test on JDK 15

Closes gh-23445
 2020-09-22 10:10:10 +02:00
dreis2211 fba1fb23e4 Fix multi-release JAR test on JDK 15 
Backport of 54f93e9

See gh-23445
 2020-09-22 10:09:18 +02:00
Andy Wilkinson 6d2deb89dd Polish 2020-09-22 09:05:34 +01:00
Phillip Webb 41dd1d0562 Merge branch '2.3.x' 2020-09-21 23:20:28 -07:00
Phillip Webb 363d35a0ac Merge branch '2.2.x' into 2.3.x 
Closes gh-23444
 2020-09-21 23:20:10 -07:00
Phillip Webb b443d22c59 Merge branch '2.1.x' into 2.2.x 
Closes gh-23443
 2020-09-21 23:19:41 -07:00
Phillip Webb cc442c5c0d Make HandlerFunctionDescription JDK 15 compatible 
Update `HandlerFunctionDescription` so that it will work with JDK 15.

Closes gh-23442
 2020-09-21 23:18:02 -07:00
Phillip Webb 19a218dc8e Backport JDK 15 detection support 
See gh-23433
 2020-09-21 23:14:51 -07:00
Phillip Webb 9d20da15d7 Merge branch '2.3.x' 2020-09-21 22:33:21 -07:00
Phillip Webb e12a449ed9 Merge branch '2.2.x' into 2.3.x 2020-09-21 22:32:49 -07:00
Phillip Webb 8b3728a57e Refine StringSequence checkstyle suppression 
See gh-23440
 2020-09-21 22:31:43 -07:00
Phillip Webb 6a663cc161 Merge branch '2.3.x' 2020-09-21 22:28:54 -07:00
Phillip Webb 3fca8c6b4e Merge branch '2.2.x' into 2.3.x 
Closes gh-23441
 2020-09-21 22:27:45 -07:00
Phillip Webb 4945806d84 Make `StringSequence.isEmpty()` public 
Make `StringSequence.isEmpty()` public for compatibility with JDK 15.

Closes gh-23440
 2020-09-21 22:26:20 -07:00
Phillip Webb 3e75dfa169 Merge branch '2.3.x' 2020-09-21 21:42:22 -07:00
Phillip Webb fa81c37422 Merge branch '2.2.x' into 2.3.x 2020-09-21 21:41:51 -07:00
Phillip Webb be00bbcf41 Merge branch '2.1.x' into 2.2.x 2020-09-21 21:41:09 -07:00
Phillip Webb 3da300fba9 Remove unused CI parameter 2020-09-21 21:40:18 -07:00
Phillip Webb de5a5abc7e Merge branch '2.3.x' 2020-09-21 21:39:13 -07:00
Phillip Webb a47bc41fe3 Merge branch '2.2.x' into 2.3.x 2020-09-21 21:29:05 -07:00
Phillip Webb e8d24948d5 Merge branch '2.1.x' into 2.2.x 2020-09-21 21:23:03 -07:00
Phillip Webb b0cc5fba4e Use per-branch CI images 
Closes gh-23439
 2020-09-21 20:03:43 -07:00
Phillip Webb 5a323aba6a Merge branch '2.3.x' 2020-09-21 17:47:02 -07:00
Phillip Webb 945347c944 Merge branch '2.2.x' into 2.3.x 2020-09-21 17:46:49 -07:00
Phillip Webb 15f2186aaf Add Java 15 to download script 
See gh-23433
 2020-09-21 17:46:20 -07:00
Phillip Webb bd23aa0824 Merge branch '2.3.x' 2020-09-21 17:44:12 -07:00
Phillip Webb b59b28767b Merge branch '2.2.x' into 2.3.x 2020-09-21 17:41:50 -07:00
Phillip Webb e6ebcf1429 Upgrade Java version used in CI from 14 to 15 
Closes gh-23433
 2020-09-21 17:18:49 -07:00
Phillip Webb 3bcbb0e594 Merge pull request #21704 from unix1982 
* pr/21704:
  Polish 'Add origin support for empty YAML list and map'
  Add origin support for empty YAML list and map

Closes gh-21704
 2020-09-21 16:45:49 -07:00
Phillip Webb bd2a252101 Polish 'Add origin support for empty YAML list and map' 
See gh-21704
 2020-09-21 16:45:16 -07:00
heinz f18d564add Add origin support for empty YAML list and map 
Update `OriginTrackedYamlLoader` to better deal with empty maps
and collections.

See gh-21704
 2020-09-21 16:44:22 -07:00
Phillip Webb c885a15aea Allow binding when 'is' method also exists 
Improve the `JavaBeanBinder` so that an bean that has both a `get` and
`is` method can still be bound.

Closes gh-23007
 2020-09-21 16:35:54 -07:00
Phillip Webb fde2e440bb Add missing registration convenience methods 
Update `BootstrapContext` with convenience methods that help if the
type has not been registered.

Closes gh-23438
 2020-09-21 16:08:36 -07:00
Phillip Webb 0df37302af Make ConfigData Resolvers/Loaders public 
Change the visibility of our own ConfigDataLocationResolver and
ConfigDataLoader classes so that they can be created outside of
`spring.factories`.

Closes gh-23434
 2020-09-21 15:36:04 -07:00
Andy Wilkinson 3587ecb043 Merge branch '2.3.x' 2020-09-21 19:28:53 +01:00
Andy Wilkinson 0963218be1 Merge branch '2.2.x' into 2.3.x 2020-09-21 19:28:39 +01:00
Andy Wilkinson 0edf7cb9b9 Polish Log4j2 XML configuration tests 
See gh-22983
 2020-09-21 19:26:40 +01:00
Andy Wilkinson 5a3232d681 Merge branch '2.3.x' 
Closes gh-23430
 2020-09-21 15:21:17 +01:00
Andy Wilkinson 13e08a4344 Merge branch '2.2.x' into 2.3.x 
Closes gh-23428
 2020-09-21 15:15:08 +01:00