Commit Graph

28159 Commits (23ad2b41560083a270ab5e2d025eaa5060585b29)
 

Author SHA1 Message Date
Phillip Webb 49c184d5cf Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 0fd7dd297a Merge branch '2.1.x' into 2.2.x 4 years ago
Phillip Webb 956ee223be Fix CI GitHub icon reference 4 years ago
Andy Wilkinson df5cd21ca5 Merge branch '2.2.x' into 2.3.x
Closes gh-23481
4 years ago
Andy Wilkinson 6dc8e6815d Align default tldScanPatterns with Tomcat's
Previously, we configured embedded Tomcat in such a way that no TLD
scan patterns were configured. This differed from a standalone
Tomcat installation where 4 patterns are configured that take
precedence over some of the skip patterns. The missing scan patterns
resulted in the skip patterns preventing the discovery of Log4j2's
TLDs.

This commit updates TomcatServletWebServerFactory to configure the
same four scan patterns as standalone Tomcat configures by default.

Fixes gh-23302
4 years ago
Andy Wilkinson e626f7f47e Merge branch '2.2.x' into 2.3.x
Closes gh-23477
4 years ago
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
4 years ago
Andy Wilkinson 184bd5b13d Merge branch '2.2.x' into 2.3.x
Closes gh-23470
4 years ago
Andy Wilkinson d208ec92fc Merge branch '2.1.x' into 2.2.x
Closes gh-23471
4 years ago
Andy Wilkinson 39a24b093d Upgrade CI to Docker 19.03.13
Closes gh-23469
4 years ago
Andy Wilkinson 0d0f55f0e3 Merge branch '2.2.x' into 2.3.x
Closes gh-23472
4 years ago
Andy Wilkinson 11e68717f9 Merge branch '2.1.x' into 2.2.x
Closes gh-23473
4 years ago
Andy Wilkinson 0690690039 Update CI images to use ubuntu:bionic-20200903
Closes gh-23468
4 years ago
Stephane Nicoll b3c5588c86 Merge branch '2.2.x' into 2.3.x
Closes gh-23461
4 years ago
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
4 years ago
Pavel Gordon 62eb835a4e Fix link to Log4j's JDK Logging Adapter in reference documentation
See gh-23459
4 years ago
Andy Wilkinson 232c310df2 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 24102656f2 Fix Log4j2 XML configuration tests on Windows
See gh-22983
4 years ago
Stephane Nicoll 3adf06df17 Merge branch '2.2.x' into 2.3.x
Closes gh-23452
4 years ago
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
4 years ago
Stephane Nicoll 531690b8e1 Merge branch '2.2.x' into 2.3.x
Closes gh-23448
4 years ago
Stephane Nicoll 7f84a92ef1 Document that Java 15 is supported
Closes gh-23447
4 years ago
Stephane Nicoll 37ded9f6d3 Merge branch '2.2.x' into 2.3.x
Closes gh-23446
4 years ago
Stephane Nicoll 9b8866c45c Merge pull request #23445 from dreis2211
* pr/23445:
  Fix multi-release JAR test on JDK 15

Closes gh-23445
4 years ago
dreis2211 fba1fb23e4 Fix multi-release JAR test on JDK 15
Backport of 54f93e9

See gh-23445
4 years ago
Phillip Webb 363d35a0ac Merge branch '2.2.x' into 2.3.x
Closes gh-23444
4 years ago
Phillip Webb b443d22c59 Merge branch '2.1.x' into 2.2.x
Closes gh-23443
4 years ago
Phillip Webb cc442c5c0d Make HandlerFunctionDescription JDK 15 compatible
Update `HandlerFunctionDescription` so that it will work with JDK 15.

Closes gh-23442
4 years ago
Phillip Webb 19a218dc8e Backport JDK 15 detection support
See gh-23433
4 years ago
Phillip Webb e12a449ed9 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 8b3728a57e Refine StringSequence checkstyle suppression
See gh-23440
4 years ago
Phillip Webb 3fca8c6b4e Merge branch '2.2.x' into 2.3.x
Closes gh-23441
4 years ago
Phillip Webb 4945806d84 Make `StringSequence.isEmpty()` public
Make `StringSequence.isEmpty()` public for compatibility with JDK 15.

Closes gh-23440
4 years ago
Phillip Webb fa81c37422 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb be00bbcf41 Merge branch '2.1.x' into 2.2.x 4 years ago
Phillip Webb 3da300fba9 Remove unused CI parameter 4 years ago
Phillip Webb a47bc41fe3 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb e8d24948d5 Merge branch '2.1.x' into 2.2.x 4 years ago
Phillip Webb b0cc5fba4e Use per-branch CI images
Closes gh-23439
4 years ago
Phillip Webb 945347c944 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 15f2186aaf Add Java 15 to download script
See gh-23433
4 years ago
Phillip Webb b59b28767b Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb e6ebcf1429 Upgrade Java version used in CI from 14 to 15
Closes gh-23433
4 years ago
Andy Wilkinson 0963218be1 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 0edf7cb9b9 Polish Log4j2 XML configuration tests
See gh-22983
4 years ago
Andy Wilkinson 13e08a4344 Merge branch '2.2.x' into 2.3.x
Closes gh-23428
4 years ago
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
4 years ago
Andy Wilkinson 8667e9ded8 Merge branch '2.2.x' into 2.3.x
Closes gh-23426
4 years ago
Andy Wilkinson 581190d7a0 Test the Gradle plugin against 6.7-rc-1
Closes gh-23425
4 years ago
Andy Wilkinson d06af28cd8 Merge branch '2.2.x' into 2.3.x
Closes gh-23422
4 years ago