root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
29,060 Commits 23 Branches 353 Tags 301 MiB
Commit Graph

29060 Commits

Author SHA1 Message Date
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 c03e16884f Merge branch '2.3.x' into master 
Closes gh-23496
 2020-09-25 12:26:56 -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 5d17bcab3e Merge branch '2.3.x' into master 2020-09-25 12:13:57 -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 ab8d33aa72 Merge branch '2.3.x' 
Closes gh-23482
 2020-09-24 19:04:33 +01: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 b662f1e06e Remove UnresolvedDependenciesAnalyzer from the Gradle plugin 
Closes gh-23479
 2020-09-24 15:16:29 +01:00
Stephane Nicoll 4d33062d30 Upgrade to Hazelcast Hibernate5 2.1.1 
Closes gh-23476
 2020-09-24 15:57:07 +02:00
Stephane Nicoll 4009acf025 Add support for Hazelcast 
This commit upgrades to Hazelcast 4.0.3, yet keeping compatibility with
Hazelcast 3.x.

Closes gh-20856
Closes gh-23475
 2020-09-24 15:57:07 +02:00
Andy Wilkinson 7b183ef99d Merge branch '2.3.x' 
Closes gh-23478
 2020-09-24 14:46:42 +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 1591da6ce4 Update Bomr to treat CalVer versions as newer than release train versions 
Closes gh-23451
 2020-09-24 10:50:37 +01:00
Stephane Nicoll ab373459fc Merge pull request #23465 from thorasine 
* pr/23465:
  Fix typos

Closes gh-23465
 2020-09-24 11:42:32 +02:00
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