Commit Graph

28889 Commits

Author SHA1 Message Date
thorasine
2d74aef6ef Fix typos
See gh-23465
2020-09-24 11:42:05 +02:00
Andy Wilkinson
cd81669f94 Merge branch '2.3.x'
Closes gh-23467
2020-09-24 09:24:56 +01:00
Andy Wilkinson
184bd5b13d Merge branch '2.2.x' into 2.3.x
Closes gh-23470
2020-09-24 09:24:38 +01:00
Andy Wilkinson
d208ec92fc Merge branch '2.1.x' into 2.2.x
Closes gh-23471
2020-09-24 09:24:18 +01:00
Andy Wilkinson
39a24b093d Upgrade CI to Docker 19.03.13
Closes gh-23469
2020-09-24 09:22:02 +01:00
Andy Wilkinson
18ec890ee4 Merge branch '2.3.x'
Closes gh-23466
2020-09-24 09:19:04 +01:00
Andy Wilkinson
0d0f55f0e3 Merge branch '2.2.x' into 2.3.x
Closes gh-23472
2020-09-24 09:17:55 +01:00
Andy Wilkinson
11e68717f9 Merge branch '2.1.x' into 2.2.x
Closes gh-23473
2020-09-24 09:17:24 +01:00
Andy Wilkinson
0690690039 Update CI images to use ubuntu:bionic-20200903
Closes gh-23468
2020-09-24 09:15:09 +01:00
Stephane Nicoll
c44e1ec0ad Merge branch '2.3.x'
Closes gh-23462
2020-09-23 14:36:59 +02:00
Stephane Nicoll
b3c5588c86 Merge branch '2.2.x' into 2.3.x
Closes gh-23461
2020-09-23 14:36:41 +02:00
Stephane Nicoll
69ca3a9169 Merge pull request #23459 from pavelgordon
* pr/23459:
  Fix link to Log4j's JDK Logging Adapter in reference documentation

Closes gh-23459
2020-09-23 14:36:26 +02:00
Pavel Gordon
62eb835a4e Fix link to Log4j's JDK Logging Adapter in reference documentation
See gh-23459
2020-09-23 14:36:00 +02:00
Stephane Nicoll
18b7512826 Merge pull request #23456 from thorasine
* pr/23456:
  Fix typo

Closes gh-23456
2020-09-23 14:21:15 +02:00
thorasine
9955dac316 Fix typo
See gh-23456
2020-09-23 14:20:51 +02:00
Stephane Nicoll
4d10fbfd52 Rewrite JobLauncherApplicationRunnerTests
This commit rewrites the test to use an in-memory database rather than
the deprecated Map-based arrangement.

Closes gh-23369
2020-09-23 14:11:01 +02:00
Andy Wilkinson
17d5e17069 Merge branch '2.3.x' 2020-09-22 16:26:58 +01:00
Andy Wilkinson
232c310df2 Merge branch '2.2.x' into 2.3.x 2020-09-22 16:26:39 +01:00
Andy Wilkinson
24102656f2 Fix Log4j2 XML configuration tests on Windows
See gh-22983
2020-09-22 16:03:58 +01:00
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