Stephane Nicoll
b22e3d51dc
Merge branch '2.7.x'
2022-02-04 10:10:29 +01:00
Henning Poettker
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
2022-02-04 09:57:59 +01:00
Phillip Webb
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
Stephane Nicoll
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
Stephane Nicoll
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
2022-02-01 09:37:15 +01:00
Andy Wilkinson
35b5b5672d
Merge branch '2.7.x'
2022-01-20 12:37:16 +00:00
Andy Wilkinson
2c049f2b40
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29501
2022-01-20 12:36:49 +00:00
Madhura Bhave
3460c24a16
Ignore context path when calling privilege evaluator
...
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.
This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.
Closes gh-29299
Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
2022-01-20 12:36:18 +00:00
Andy Wilkinson
1fa541d4de
Merge branch '2.7.x'
2022-01-19 17:24:42 +00:00
Andy Wilkinson
fa9a4a6452
Merge branch '2.6.x' into 2.7.x
2022-01-19 17:24:29 +00:00
Andy Wilkinson
4c422b9f3c
Merge branch '2.5.x' into 2.6.x
2022-01-19 17:24:17 +00:00
Andy Wilkinson
b60612dabb
Disable LoaderIntegrationTests when Docker's unavailable
...
Closes gh-29385
2022-01-19 17:23:30 +00:00
Phillip Webb
13f6729b37
Merge branch '2.7.x'
2022-01-18 18:49:08 -08:00
Phillip Webb
e95c514fd5
Merge branch '2.6.x' into 2.7.x
2022-01-18 18:48:53 -08:00
Phillip Webb
f6cdc27b2a
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:48:40 -08:00
Phillip Webb
eca05c42fb
Further refine LoaderIntegrationTests for CI
...
Update `LoaderIntegrationTests` to filter compatible JDKs early.
See gh-29385
2022-01-18 18:47:41 -08:00
Phillip Webb
e18cbe5fe2
Merge branch '2.7.x'
2022-01-18 18:19:46 -08:00
Phillip Webb
8aacf4cb36
Merge branch '2.6.x' into 2.7.x
2022-01-18 18:19:07 -08:00
Phillip Webb
392de30390
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:18:56 -08:00
Phillip Webb
de8f8c3e64
Refine LoaderIntegrationTests for CI
...
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.
See gh-29385
2022-01-18 18:16:47 -08:00
Phillip Webb
2d1854a682
Merge branch '2.7.x'
2022-01-18 17:42:34 -08:00
Phillip Webb
1f77533b09
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29463
2022-01-18 17:37:10 -08:00
Phillip Webb
44537d4494
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29462
2022-01-18 17:36:59 -08:00
Phillip Webb
3d908079ef
Run LoaderIntegrationTests against multiple JDKs
...
Update `LoaderIntegrationTests` to run against OpenJDK 8, 11 and 17 as
well as Oracle JDK 17.
Closes gh-29385
2022-01-18 17:36:48 -08:00
Andy Wilkinson
26fecbe230
Upgrade to Thymeleaf and Security Extras 3.1.0-M1
...
Closes gh-49452
Closes gh-49453
2022-01-18 16:01:29 +00:00
Andy Wilkinson
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00
Phillip Webb
cb97aff1e7
Merge branch '2.7.x'
2022-01-14 13:57:35 -08:00
Phillip Webb
9278a502c7
Merge branch '2.6.x' into 2.7.x
2022-01-14 13:57:25 -08:00
Phillip Webb
14fe9347b5
Merge branch '2.5.x' into 2.6.x
2022-01-14 13:56:47 -08:00
Phillip Webb
3f7bf7d34f
Modify SpringApplication Environment rather than setting it
...
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.
Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.
With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.
Fixes gh-29169
2022-01-14 13:47:22 -08:00
Phillip Webb
13f257a706
Merge branch '2.7.x'
2022-01-12 15:44:47 -08:00
Phillip Webb
8147eb6d6d
Merge branch '2.6.x' into 2.7.x
2022-01-12 15:43:44 -08:00
Phillip Webb
e7fe371927
Merge branch '2.5.x' into 2.6.x
2022-01-12 15:43:11 -08:00
Phillip Webb
27ad0804f5
Update copyright year of changed files
2022-01-12 15:42:25 -08:00
Phillip Webb
3d6840e715
Merge branch '2.7.x'
...
Closes gh-29376
2022-01-12 15:32:51 -08:00
Phillip Webb
fee45e056a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29375
2022-01-12 15:32:34 -08:00
Phillip Webb
91d2b1b988
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29374
2022-01-12 15:32:00 -08:00
Phillip Webb
eb6b48fff0
Use side-effect free environment with tests rather than converting
...
Refine the logic introduced in 64270eca
to use a side-effect free
Environment implementation rather than converting the Environment early.
Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.
Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb
1b7db2750d
Merge branch '2.7.x'
...
Closes gh-29373
2022-01-12 14:08:04 -08:00
Phillip Webb
e1c84e2972
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb
72696cdb0f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb
7c16668bf3
Log Docker output to aid debugging
...
Add an SLF4J logger so that we can see real time output of the
Docker container.
See gh-29370
2022-01-12 14:03:27 -08:00
Stephane Nicoll
69d1c3674a
Upgrade to latest Hazelcast 3.x in integration tests
2022-01-06 17:41:26 +01:00
Stephane Nicoll
a780e87e9c
Upgrade to Hazelcast 5.0.2
...
See gh-29265
2022-01-06 17:38:06 +01:00
Phillip Webb
06398eabed
Merge branch '2.7.x'
2022-01-04 12:26:24 -08:00
Phillip Webb
b25e92f3e2
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:24:34 -08:00
Phillip Webb
760dcffd8b
Merge branch '2.7.x'
2022-01-04 12:22:54 -08:00