root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
27,924 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

27924 Commits

Author SHA1 Message Date
Stephane Nicoll 756a86aa8f Rename changelog generator's task name 
Closes gh-23493
 2020-09-28 14:38:21 +02:00
Stephane Nicoll 2c1634e6ed Merge branch '2.2.x' into 2.3.x 
Closes gh-23508
 2020-09-28 09:21:51 +02:00
Stephane Nicoll e25e67cbff Merge pull request #23502 from chenrujun 
* pr/23502:
  Add mising entry for Netty tcnative dependency management

Closes gh-23502
 2020-09-28 09:19:27 +02:00
Rujun Chen 8330752b11 Add mising entry for Netty tcnative dependency management 
See gh-23502
 2020-09-28 09:18:44 +02:00
Andy Wilkinson 9bd040cb0f Merge branch '2.2.x' into 2.3.x 
Closes gh-23500
 2020-09-26 09:16:46 +01:00
Andy Wilkinson e74f777971 Remove use of spring-core's Assert from PropertiesLauncher 
Fixes gh-23474
 2020-09-26 09:11:05 +01:00
Phillip Webb f53b031628 Merge branch '2.2.x' into 2.3.x 2020-09-25 12:42:38 -07:00
Phillip Webb 325194093c Merge branch '2.1.x' into 2.2.x 2020-09-25 12:42:29 -07:00
Phillip Webb 6d70c3867e Upgrade to latest concourse-java-scripts 2020-09-25 12:41:58 -07:00
Phillip Webb ff4d3eb1be Merge branch '2.2.x' into 2.3.x 
Closes gh-23498
 2020-09-25 12:40:57 -07:00
Phillip Webb f16eabad0a Merge branch '2.1.x' into 2.2.x 
Closes gh-23497
 2020-09-25 12:40:44 -07:00
Phillip Webb 56a8125eee Upgrade docker images to Ubuntu Focal 
Closes gh-23492
 2020-09-25 12:38:44 -07:00
Phillip Webb e077ee4d63 Merge branch '2.2.x' into 2.3.x 
Closes gh-23495
 2020-09-25 12:23:59 -07:00
Phillip Webb 4bc3a34f54 Merge branch '2.1.x' into 2.2.x 
Closes gh-23494
 2020-09-25 12:23:45 -07:00
Phillip Webb abe169d593 Upgrade to github-changelog-generator 0.0.3 
Closes gh-23493
 2020-09-25 12:20:44 -07:00
Phillip Webb 49c184d5cf Merge branch '2.2.x' into 2.3.x 2020-09-25 12:13:44 -07:00
Phillip Webb 0fd7dd297a Merge branch '2.1.x' into 2.2.x 2020-09-25 12:12:47 -07:00
Phillip Webb 956ee223be Fix CI GitHub icon reference 2020-09-25 12:10:18 -07:00
Andy Wilkinson df5cd21ca5 Merge branch '2.2.x' into 2.3.x 
Closes gh-23481
 2020-09-24 19:04:17 +01:00
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
 2020-09-24 17:51:38 +01:00
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