Commit Graph

27898 Commits

Author SHA1 Message Date
Thorasine
6c3dfac1d0 Fix typos
See gh-23561
2020-10-02 09:32:26 +02:00
Madhura Bhave
e2289e2f21 Merge branch '2.2.x' into 2.3.x
Closes gh-23569
2020-10-01 18:19:35 -07:00
Madhura Bhave
4dad8c221a Merge pull request #23566 from Shraddha-Yeole
* pr/23566:
  Polish "Do not fail if h2Console bean cannot connect to db"
  Do not fail if h2Console bean cannot connect to db

Closes gh-23566
2020-10-01 18:16:56 -07:00
Madhura Bhave
c0f158dffd Polish "Do not fail if h2Console bean cannot connect to db"
See gh-23566
2020-10-01 18:16:11 -07:00
Shraddha Yeole
2d76de29ff Do not fail if h2Console bean cannot connect to db
See gh-23566
2020-10-01 18:10:48 -07:00
Madhura Bhave
9a6d52e30d Merge branch '2.2.x' into 2.3.x 2020-10-01 18:01:53 -07:00
Madhura Bhave
3118ca9313 Polish 2020-10-01 18:01:11 -07:00
Madhura Bhave
121ba2b0ab Merge branch '2.2.x' into 2.3.x
Closes gh-23567
2020-10-01 17:16:37 -07:00
Madhura Bhave
0cdb1b3b26 Merge pull request #23562 from ketaki-t
* pr/23562:
  Remove documentation for unsupported gradle versions

Closes gh-23562
2020-10-01 17:14:07 -07:00
ketaki-t
66aa24b5f0 Remove documentation for unsupported gradle versions
See gh-23562
2020-10-01 17:13:26 -07:00
Andy Wilkinson
914dccade2 Merge branch '2.2.x' into 2.3.x
Closes gh-23555
2020-10-01 12:30:16 +01:00
Andy Wilkinson
323af718e2 Only change the method of requests that Jetty won't handle by default
Previously, JettyEmbeddedErrorHandler would change the method of every
request that is handles to GET. This was being done to work around
Jetty's error handling only dealing with GET, POST, and HEAD requests
by default. It had the unwanted side-effect of causing an error
response to a HEAD request having a body as, from the error handling's
perspective, it was a GET request.

This commit updates JettyEmbeddedErrorHandler to only set the method
on a request for which error handling is being performed if the method
isn't already one that will be handled, leaving the method of GET,
POST, and HEAD requests unchanged.

Unfortunately, short of implementing an HTTP client, this change cannot
be tested as the Apache HttpClient, OkHttp, and the JDK's
HttpURLConnection all silently drop the body of a response to a HEAD
request, preventing a test from asserting that a body hasn't been sent.

Closes gh-23551
2020-10-01 12:29:44 +01:00
Stephane Nicoll
74a164e822 Upgrade Ubuntu version in CI images
Closes gh-23548
2020-10-01 10:44:27 +02:00
Stephane Nicoll
23698de21c Merge branch '2.2.x' into 2.3.x 2020-10-01 10:43:39 +02:00
Stephane Nicoll
b3563deeb3 Upgrade Ubuntu version in CI images
Closes gh-23549
2020-10-01 10:43:11 +02:00
Stephane Nicoll
94da5155d6 Merge branch '2.1.x' into 2.2.x 2020-10-01 10:42:17 +02:00
Stephane Nicoll
abee05c67b Upgrade Ubuntu version in CI images
Closes gh-23546
2020-10-01 10:39:25 +02:00
Andy Wilkinson
bd4934b0fd Fix matching of SNAPSHOT artifacts when customizing layers
Previously the artifact's version was used. In an artifact's version,
SNAPSHOT is replaced with the timestamped version number of a specific
snapshot. As a result, it no longer matches the *:*:*SNAPSHOT pattern.

This commit replaces switches to using the artifact's base version.
This preserves the SNAPSHOT in the version number. For non-snapshot
artifacts, the version and base version are identical.

Fixes gh-23533
2020-09-30 14:48:04 +01:00
Stephane Nicoll
cd15cbdc79 Do not execute datasource initialization in a separate thread
This commit makes sure that `data.sql` is performed in the same thread
as the one initializing the JPA container.

Closes gh-22852
2020-09-30 10:10:16 +02:00
Stephane Nicoll
789fafadac Start building against Spring Framework 5.3.10 snapshots
See gh-23526
2020-09-30 10:00:21 +02:00
Stephane Nicoll
466c1012d6 Merge branch '2.2.x' into 2.3.x
Closes gh-23521
2020-09-29 10:44:30 +02:00
Stephane Nicoll
fd3683646a Migrate SessionAutoConfigurationMongoTests to Testcontainers
Closes gh-23512
2020-09-29 10:34:59 +02:00
Stephane Nicoll
209f92cfd4 Merge branch '2.2.x' into 2.3.x
See gh-23495
2020-09-28 14:40:10 +02:00
Stephane Nicoll
350ef9755d Merge branch '2.1.x' into 2.2.x
See gh-23494
2020-09-28 14:39:15 +02:00
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