Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,854 Commits 23 Branches 0 Tags
e626f7f47ea67c086bea3e4326659d93dd144ba4
Commit Graph

27854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
e626f7f47e Merge branch '2.2.x' into 2.3.x 
Closes gh-23477
 2020-09-24 14:45:55 +01:00
Andy Wilkinson
bf9d23e55a Consider SpringBootTest's web environment in context cache key 
Previously, the web environment configured on `@SpringBootTest` was not
part of the context cache key. As a result, two test classes that has
identical configuration other than one using a MOCK web environment and
the other using a DEFINED_PORT web environment would share a context
when they should not do so. Classes that use MOCK and RANDOM_PORT were
not affected as the use of RANDOM_PORT results in a property for the
port being added to the environment.

This commit adds a new ContextCustomizer, SpringBootTestWebEnvironment,
that is used to capture the `webEnvironment` from `@SpringBootTest`
and use it in its hashCode and equals implementations. This fixes the
problem as all context customizers are evaluated when determing the
equality of two context cache keys.

Fixes gh-23085
 2020-09-24 14:43:51 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
13e08a4344 Merge branch '2.2.x' into 2.3.x 
Closes gh-23428
 2020-09-21 15:15:08 +01:00
Andy Wilkinson
f6492cd0c0 Consume level and dateformat patterns as system props in Log4j config 
Previously LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN were not
consumed as system properties in log4j2.xml and log4j2-file.xml. As a
result, the logging.pattern.level and logging.pattern.dateformat
configuration properties, which are translated into the
LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN system properties
respectively had no effect.

This commit updates the log4j2.xml and log4j2-file.xml config files to
consume LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN as system
properties. When the system property is not set, the configuation falls
back to the default values specified in the config files. Tests for
both log4j2.xml and log4j2-file.xml to verify the behaviour have also
bean added.

Fixes gh-22983
 2020-09-21 15:08:41 +01:00
Andy Wilkinson
8667e9ded8 Merge branch '2.2.x' into 2.3.x 
Closes gh-23426
 2020-09-21 12:16:14 +01:00
Andy Wilkinson
581190d7a0 Test the Gradle plugin against 6.7-rc-1 
Closes gh-23425
 2020-09-21 12:14:35 +01:00
Andy Wilkinson
d06af28cd8 Merge branch '2.2.x' into 2.3.x 
Closes gh-23422
 2020-09-21 10:47:06 +01:00
Andy Wilkinson
3a3e240924 Merge pull request #23418 from fernandezseb 
* gh-23418:
  Polish "Add note about Kotlin main class name"
  Add note about Kotlin main class name

Closes gh-23418
 2020-09-21 10:46:53 +01:00
Andy Wilkinson
360e29af48 Polish "Add note about Kotlin main class name" 
See gh-23418
 2020-09-21 10:40:29 +01:00
Sebastiaan Fernandez
0bde5fda9b Add note about Kotlin main class name 
See gh-23418
 2020-09-21 10:36:16 +01:00
Andy Wilkinson
8eb7815a4d Merge branch '2.2.x' into 2.3.x 2020-09-20 17:00:46 +01:00
Andy Wilkinson
a8c179e922 Merge branch '2.1.x' into 2.2.x 
Closes gh-23416
 2020-09-20 16:58:40 +01:00