Commit Graph

27888 Commits (914dccade2b26a795c00217b999dbd5c7932fcb4)
 

Author SHA1 Message Date
Andy Wilkinson 914dccade2 Merge branch '2.2.x' into 2.3.x
Closes gh-23555
4 years ago
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
4 years ago
Stephane Nicoll 74a164e822 Upgrade Ubuntu version in CI images
Closes gh-23548
4 years ago
Stephane Nicoll 23698de21c Merge branch '2.2.x' into 2.3.x 4 years ago
Stephane Nicoll b3563deeb3 Upgrade Ubuntu version in CI images
Closes gh-23549
4 years ago
Stephane Nicoll 94da5155d6 Merge branch '2.1.x' into 2.2.x 4 years ago
Stephane Nicoll abee05c67b Upgrade Ubuntu version in CI images
Closes gh-23546
4 years ago
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
4 years ago
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
4 years ago
Stephane Nicoll 789fafadac Start building against Spring Framework 5.3.10 snapshots
See gh-23526
4 years ago
Stephane Nicoll 466c1012d6 Merge branch '2.2.x' into 2.3.x
Closes gh-23521
4 years ago
Stephane Nicoll fd3683646a Migrate SessionAutoConfigurationMongoTests to Testcontainers
Closes gh-23512
4 years ago
Stephane Nicoll 209f92cfd4 Merge branch '2.2.x' into 2.3.x
See gh-23495
4 years ago
Stephane Nicoll 350ef9755d Merge branch '2.1.x' into 2.2.x
See gh-23494
4 years ago
Stephane Nicoll 756a86aa8f Rename changelog generator's task name
Closes gh-23493
4 years ago
Stephane Nicoll 2c1634e6ed Merge branch '2.2.x' into 2.3.x
Closes gh-23508
4 years ago
Stephane Nicoll e25e67cbff Merge pull request #23502 from chenrujun
* pr/23502:
  Add mising entry for Netty tcnative dependency management

Closes gh-23502
4 years ago
Rujun Chen 8330752b11 Add mising entry for Netty tcnative dependency management
See gh-23502
4 years ago
Andy Wilkinson 9bd040cb0f Merge branch '2.2.x' into 2.3.x
Closes gh-23500
4 years ago
Andy Wilkinson e74f777971 Remove use of spring-core's Assert from PropertiesLauncher
Fixes gh-23474
4 years ago
Phillip Webb f53b031628 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 325194093c Merge branch '2.1.x' into 2.2.x 4 years ago
Phillip Webb 6d70c3867e Upgrade to latest concourse-java-scripts 4 years ago
Phillip Webb ff4d3eb1be Merge branch '2.2.x' into 2.3.x
Closes gh-23498
4 years ago
Phillip Webb f16eabad0a Merge branch '2.1.x' into 2.2.x
Closes gh-23497
4 years ago
Phillip Webb 56a8125eee Upgrade docker images to Ubuntu Focal
Closes gh-23492
4 years ago
Phillip Webb e077ee4d63 Merge branch '2.2.x' into 2.3.x
Closes gh-23495
4 years ago
Phillip Webb 4bc3a34f54 Merge branch '2.1.x' into 2.2.x
Closes gh-23494
4 years ago
Phillip Webb abe169d593 Upgrade to github-changelog-generator 0.0.3
Closes gh-23493
4 years ago
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