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
36,672 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

603 Commits

Author SHA1 Message Date
Andy Wilkinson b60612dabb Disable LoaderIntegrationTests when Docker's unavailable 
Closes gh-29385
 2022-01-19 17:23:30 +00: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 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 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
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 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 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 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 b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08:00
izeye 728206dba0 Polish GraphQL changes 
See gh-29140
Closes gh-29194
 2022-01-03 17:36:57 +01:00
Brian Clozel 88ee4fab36 Polish 
See gh-29140
 2021-12-21 10:33:51 +01:00
Brian Clozel c522a8007b Add smoke test for Spring GraphQL 
See gh-29140
 2021-12-21 08:34:49 +01:00
Madhura Bhave d9d161cd6b Allow previously authorized users to access the error page 
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
 or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.

This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.

Fixes gh-28953
 2021-12-17 16:58:58 -08:00
Phillip Webb f676602c96 Merge branch '2.5.x' into 2.6.x 2021-12-16 13:49:12 -08:00
Phillip Webb 783981ba98 Merge branch '2.4.x' into 2.5.x 2021-12-16 13:48:25 -08:00
Phillip Webb d336a96b7f Update web.xml xsd references to for 3.1 version 
See gh-29075
 2021-12-16 13:45:12 -08:00
Phillip Webb 6e01c3edbe Merge branch '2.5.x' into 2.6.x 
Closes gh-29077
 2021-12-15 22:17:22 -08:00
Phillip Webb 17363d1b3a Merge branch '2.4.x' into 2.5.x 
Closes gh-29076
 2021-12-15 22:16:37 -08:00
Phillip Webb 1749c893dc Update web-app version to 3.1 
Update the web-app version specified in `web.xml` to 3.1 in order to
make Eclipse happy.

Closes gh-29075
 2021-12-15 22:14:52 -08:00
Andy Wilkinson 3b23c542a0 Test servlet 3.1 compatibility in deployment tests 
Closes gh-28906
 2021-12-09 12:24:43 +00:00
Phillip Webb beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Scott Frederick 4eed637481 Merge branch '2.5.x' 
Closes gh-28789
 2021-11-23 12:45:46 -06:00
Scott Frederick 12244a8edd Remove use of Thymeleaf from smoke tests 
Closes gh-28788
 2021-11-23 12:13:05 -06:00
Andy Wilkinson 015cf920da Name custom task inputs 
Closes gh-28753
 2021-11-19 15:35:39 +00:00
Phillip Webb b6d0b44703 Fix @SuppressWarnings 2021-11-18 17:26:18 -08:00
Madhura Bhave dd1d1482dc Deny unauthorized access to the error page 
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
 2021-11-18 15:41:38 -08:00
Andy Wilkinson 7ed19a3b59 Merge branch '2.5.x' 
Closes gh-28735
 2021-11-18 12:21:11 +00:00
Andy Wilkinson 88457d9cfa Merge branch '2.4.x' into 2.5.x 
Closes gh-28734
 2021-11-18 12:20:50 +00:00
Andy Wilkinson 7d19ea4ca1 Limit log output produced by spring-boot-deployment-tests:intTest 
Closes gh-28730
 2021-11-18 12:18:34 +00:00
Madhura Bhave 6b79d2860f Merge branch '2.5.x' into main 
Closes gh-28724
 2021-11-17 16:41:23 -08:00
Madhura Bhave 64270eca51 Convert environment used by SpringBootTestContextLoader 
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.

The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.

Fixes gh-28530
 2021-11-17 16:40:53 -08:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x' 
Closes gh-28662
 2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x 
Closes gh-28661
 2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters 
Closes gh-28658
 2021-11-12 20:04:35 +00:00
Andy Wilkinson c80283b85f Merge branch '2.5.x' 
Closes gh-28653
 2021-11-12 13:05:42 +00:00
Andy Wilkinson 92fd3b79a5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28652
 2021-11-12 13:05:14 +00:00
Andy Wilkinson 08aac25c00 Limit logging produced by spring-boot-loader-tests's intTest task 
Closes gh-28651
 2021-11-12 13:04:10 +00:00
Andy Wilkinson c7a2d61aee Merge branch '2.4.x' 
Closes gh-28485
 2021-10-29 13:48:36 +01:00
Andy Wilkinson 7fe6f4887c Merge branch '2.4.x' into 2.5.x 
Closes gh-28484
 2021-10-29 13:48:23 +01:00
Andy Wilkinson 22d85e6d7b Allow tests to be run in parallel across multiple workers 
Closes gh-19876
 2021-10-29 12:48:45 +01:00
Andy Wilkinson 2541c0cbdc Disable on Windows tests that use embedded Kafka 
Closes gh-28406
 2021-10-21 10:46:50 +01:00
Madhura Bhave 42d21a8336 Remove parameterization of session smoke tests 
There are dedicated smoke tests for Hazelcast, MongoDB and Redis
that run on CI.
This commit also polishes some of the other smoke tests related to
Spring Session
 2021-10-19 16:47:53 -07:00
Madhura Bhave 2caa6cb227 Polish "Add smoke tests for Spring Session Redis/Mongo" 
See gh-28362
 2021-10-19 15:54:19 -07:00
Angel L. Villalain Garcia 9a16c246ec Add smoke tests for Spring Session Redis/Mongo 
Add smoke tests that verify the correct behavior of the sessions
endpoint when using Spring Session with MongoDB and Redis.

See gh-28362
 2021-10-19 15:53:59 -07:00
Stephane Nicoll 4ebac4cc66 Merge branch '2.5.x' 
Closes gh-28279
 2021-10-11 09:09:15 +02:00
Stephane Nicoll 0103eb123b Merge branch '2.4.x' into 2.5.x 
Closes gh-28278
 2021-10-11 09:09:08 +02:00
dreis2211 ae1167e026 Remove unused settings.xml in integration tests 
See gh-28269
 2021-10-11 09:08:29 +02:00
Madhura Bhave b350eaee8a Fix checkstyle 2021-10-06 21:36:52 -07:00
Madhura Bhave 1ff900cce8 Merge pull request #28173 from kandulsh 
* pr/28173:
  Polish "Add smoke test with Spring Session and Hazelcast"
  Add smoke test with Spring Session and Hazelcast

Closes gh-28173
 2021-10-06 16:02:24 -07:00
Madhura Bhave 8dcf3e2c70 Polish "Add smoke test with Spring Session and Hazelcast" 
See gh-28173
 2021-10-06 16:02:14 -07:00
Susmitha 70dd655b60 Add smoke test with Spring Session and Hazelcast 
See gh-28173
 2021-10-06 16:00:27 -07:00
Andy Wilkinson 0b58d4858d Merge branch '2.5.x' 
Closes gh-28200
 2021-10-05 11:13:20 +01:00
Andy Wilkinson 322615d9c5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28199
 2021-10-05 11:12:48 +01:00
Andy Wilkinson 8c3820f87e Fix up-to-date checking of syncAppSource tasks 
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.

This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.

Closes gh-28197
 2021-10-05 11:08:22 +01:00
Andy Wilkinson 29637706a9 Merge branch '2.5.x' 
Closes gh-28166
 2021-10-01 14:16:33 +01:00
Andy Wilkinson 14a57adb53 Merge branch '2.4.x' into 2.5.x 
Closes gh-28165
 2021-10-01 14:16:20 +01:00
Andy Wilkinson 35b16ea04e Minimize dependencies of launch script test app 
Closes gh-28164
 2021-10-01 14:15:52 +01:00
Phillip Webb 55a1ec72cc Update copyright year of changed files 2021-09-21 11:25:50 -07:00
Phillip Webb 4c2c4ec16c Merge branch '2.5.x' 2021-09-21 11:25:36 -07:00
Phillip Webb 5ba69634c9 Merge branch '2.4.x' into 2.5.x 2021-09-21 11:17:55 -07:00
Phillip Webb dfd36673f7 Update copyright year of changed files 2021-09-21 11:17:19 -07:00
dreis2211 cf0fcafd13 Polish 
See gh-27940
 2021-09-21 08:08:29 +02:00
Madhura Bhave 8fd9eb72d4 Allow part of a composite contributor in a health group 
Closes gh-23027

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-08-18 15:44:10 -07:00
Andy Wilkinson fd2fbcb3c6 Merge branch '2.5.x' 
Closes gh-27758
 2021-08-18 18:28:34 +01:00
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27757
 2021-08-18 17:56:32 +01:00
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes" 
See gh-27736
 2021-08-18 17:52:42 +01:00
izeye 8a425dedfd Polish access modifiers for test classes 
See gh-27736
 2021-08-18 17:38:40 +01:00
Andy Wilkinson 2dfdcf5e88 Merge branch '2.5.x' 
Closes gh-27754
 2021-08-18 13:52:23 +01:00
Andy Wilkinson 0d904b8868 Merge branch '2.4.x' into 2.5.x 
Closes gh-27753
 2021-08-18 13:51:49 +01:00
Andy Wilkinson 0b7994a679 Polish "Use 2012 for copyright beginning year" 
See gh-27734
 2021-08-18 13:48:29 +01:00
Andy Wilkinson e737388f5c Merge branch '2.5.x' 
Closes gh-27654
 2021-08-12 18:09:04 +01:00
Andy Wilkinson d6cf46acc5 Merge branch '2.4.x' into 2.5.x 
Closes gh-27653
 2021-08-12 18:08:37 +01:00
Andy Wilkinson 403dda7f0d Remove field inject and circular reference from Data Mongo smoke test 
Closes gh-27651
 2021-08-12 18:07:42 +01:00
Andy Wilkinson e265825653 Merge branch '2.5.x' 
Closes gh-27506
 2021-07-27 11:03:00 +01:00
Andy Wilkinson 08e26c97aa Merge branch '2.4.x' into 2.5.x 
Closes gh-27505
 2021-07-27 11:02:20 +01:00
Andy Wilkinson 031a036c9f Customize security filter registration in separate management context 
Fixes gh-27372
 2021-07-27 10:57:38 +01:00
Scott Frederick 32bb6f6989 Move deployment tests to system tests pipeline 
Closes gh-27499
 2021-07-26 15:29:56 -05:00
Andy Wilkinson 14db8aec95 Skip server tests on Java 16 as Gradle Plugin is not available 
See gh-27476
 2021-07-23 19:44:29 +01:00
Andy Wilkinson f830ce5e17 Merge branch '2.5.x' 2021-07-23 17:40:29 +01:00
Andy Wilkinson 27ae302905 Merge branch '2.4.x' into 2.5.x 2021-07-23 17:40:20 +01:00
Andy Wilkinson 931409cdd4 Update copyright header in changed files 2021-07-23 17:39:55 +01:00
Andy Wilkinson fc9f38351a Merge branch '2.5.x' 
Closes gh-27479
 2021-07-23 17:34:55 +01:00
Andy Wilkinson bd3aec4f80 Merge branch '2.4.x' into 2.5.x 
Closes gh-27478
 2021-07-23 17:30:27 +01:00
Andy Wilkinson d9a24f32b4 Rework spring-boot-server-tests to avoid using Maven 
Closes gh-27476
 2021-07-23 17:30:07 +01:00