Commit Graph

25021 Commits

Author SHA1 Message Date
Andy Wilkinson
48acaa4bd9 Make AutoConfigureMockMvc use SecurityProperties' filter ordering
Previously, AutoConfigureMockMvc used Spring Security's default filter
ordering, ignoring the value configured by SecurityProperties that is
used at runtime. This resulted in different ordering at runtime and in
tests.

This commit updates the configuration for AutoConfigureMockMvc to
import the Spring Security filter auto-configuration, thereby ensuring
that the ordering configured via SecurityProperties is applied.

Fixes gh-21801
2020-06-10 09:51:05 +01:00
Madhura Bhave
36faa1d42a Document using system properties in gradle plugin docs
Closes gh-21317
2020-06-09 16:07:54 -07:00
Stephane Nicoll
6597c0c7f7 Start building against Spring Data Moore-SR8 snapshots
See gh-21775
2020-06-09 16:27:15 +02:00
Stephane Nicoll
cc3575b3f4 Merge branch '2.1.x' into 2.2.x 2020-06-09 16:26:44 +02:00
Stephane Nicoll
79f0e38c54 Start building against Spring Data Lovelace-SR18 snapshots
See gh-21774
2020-06-09 16:16:34 +02:00
Stephane Nicoll
9a457527fd Polish test 2020-06-09 16:00:50 +02:00
Stephane Nicoll
180e57a8d7 Start building against Spring Batch 4.2.3 snapshots
See gh-21783
2020-06-09 14:50:53 +02:00
Stephane Nicoll
7b4707aab5 Start building against Spring Kafka 2.3.9 snapshots
See gh-21781
2020-06-09 14:49:57 +02:00
Stephane Nicoll
5cde880562 Start building against Spring Integration 5.2.7 snapshots
See gh-21778
2020-06-09 14:49:17 +02:00
Stephane Nicoll
679816d3a4 Upgrade to Spring Framework 5.2.7
Closes gh-21738
2020-06-09 14:48:32 +02:00
Stephane Nicoll
4149b66c7e Merge branch '2.1.x' into 2.2.x 2020-06-09 14:47:41 +02:00
Stephane Nicoll
36a05375c7 Start building against Spring Kafka 2.2.14 snapshots
See gh-21780
2020-06-09 14:23:58 +02:00
Stephane Nicoll
445a9a461b Start building against Spring Integration 5.1.11 snapshots
See gh-21777
2020-06-09 14:23:58 +02:00
Stephane Nicoll
de6ee358fb Upgrade to Spring Framework 5.1.16
Closes gh-21729
2020-06-09 13:36:32 +02:00
Andy Wilkinson
a0f29edd4d Always initialize stompWebSocketHandlerMapping eagerly
Previously, when lazy initialization was enabled, STOMP-based WebSocket
messaging would not work as the stompWebSocketHandlerMapping bean was
not initialized and CONNECT requests would go unanswered.

This commit adds a LazyInitializationExcludeFilter that causes the
stompWebSocketHandlerMapping bean to always be initialized eagerly.
This triggers initialization of the WebSocket transport allowing
requests to be received and processed.

Fixes gh-19611
2020-06-09 11:02:02 +01:00
Stephane Nicoll
3889e6336a Upgrade to Reactor Dysprosium-SR8
Closes gh-21730
2020-06-09 09:02:55 +02:00
Stephane Nicoll
72c2638d6f Merge branch '2.1.x' into 2.2.x 2020-06-09 09:01:55 +02:00
Stephane Nicoll
10e0ca7dce Upgrade to Reactor Californium-SR19
Closes gh-21728
2020-06-09 09:01:13 +02:00
Phillip Webb
ee00b57a78 Merge branch '2.1.x' into 2.2.x 2020-06-08 10:50:28 -07:00
Dave Syer
b59b48e40e Ignore 'attach_pid' files 2020-06-08 10:50:07 -07:00
Andy Wilkinson
13564b4a13 Merge pull request #20716 from norio-io
* gh-20716:
  Polish "Clarify loss of defaults when adding custom mapping"
  Clarify loss of defaults when adding custom mapping

Closes gh-20716
2020-06-08 17:41:46 +01:00
Andy Wilkinson
2de906caf7 Polish "Clarify loss of defaults when adding custom mapping"
See gh-20716
2020-06-08 17:34:11 +01:00
Norio
9f009e4445 Clarify loss of defaults when adding custom mapping
See gh-20716
2020-06-08 17:31:26 +01:00
Andy Wilkinson
4a0e8217f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21759
2020-06-08 17:07:51 +01:00
Andy Wilkinson
5dce945e29 Document dispatcher-types configuration for secured error pages
Closes gh-19293
2020-06-08 17:06:42 +01:00
Andy Wilkinson
296da88e31 Merge branch '2.1.x' into 2.2.x
Closes gh-21754
2020-06-08 14:43:14 +01:00
Andy Wilkinson
c96455f7cf Remove . from CLI's classpath on Unix-like platforms
Previously, the spring bash script added . to the classpath but the
Windows spring.bat script did not. This commit aligns the classpath
of the two scripts by removing . from the classpath in the bash
script.

Fixes gh-19910
2020-06-08 14:40:14 +01:00
Andy Wilkinson
ad158ee729 Merge branch '2.1.x' into 2.2.x
Closes gh-21751
2020-06-08 14:29:53 +01:00
Andy Wilkinson
020a47ba3e Document support for Gradle 5
Closes gh-15358
2020-06-08 14:29:07 +01:00
Andy Wilkinson
8da1e3addb Merge branch '2.1.x' into 2.2.x 2020-06-08 11:35:10 +01:00
Andy Wilkinson
6a9450ee8b Polish 2020-06-08 11:34:56 +01:00
Phillip Webb
bfe1c281f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21743
2020-06-07 10:25:33 -07:00
Phillip Webb
70e0a27949 Drop the use of the term "white list"
Closes gh-21737
2020-06-07 10:22:35 -07:00
Stephane Nicoll
4c26c7d043 Start building against Spring Framework 5.2.7 snapshots
See gh-21738
2020-06-07 10:54:38 +02:00
Stephane Nicoll
b997154caa Merge branch '2.1.x' into 2.2.x 2020-06-07 10:53:47 +02:00
Stephane Nicoll
d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots
See gh-21729
2020-06-07 10:37:47 +02:00
Stephane Nicoll
f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21730
2020-06-06 09:26:15 +02:00
Stephane Nicoll
9141e9b9e0 Merge branch '2.1.x' into 2.2.x 2020-06-06 09:24:54 +02:00
Stephane Nicoll
0b0187cd0d Start building against Reactor Californium-SR19 snapshots
See gh-21728
2020-06-06 08:48:15 +02:00
Phillip Webb
97d4613fba Refine prepare-forward-merge to detect master 2020-06-05 16:21:36 -07:00
Phillip Webb
0a05b4c9fd Update copyright year of changed files 2020-06-05 15:36:09 -07:00
Phillip Webb
c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
2020-06-05 15:36:09 -07:00
Stephane Nicoll
221e248b66 Merge pull request #21671 from dreis2211
* pr/21671:
  Remove usages of deprecated Connector.setAttribute()

Closes gh-21671
2020-06-05 16:41:07 +02:00
dreis2211
9bb22ffb69 Remove usages of deprecated Connector.setAttribute()
See gh-21671
2020-06-05 16:32:42 +02:00
Stephane Nicoll
eb38eeaf30 Polish 2020-06-05 16:25:12 +02:00
Andy Wilkinson
1a52009cfb Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter
Closes gh-21717
2020-06-05 13:40:30 +01:00
Andy Wilkinson
97533a5364 Merge branch '2.1.x' into 2.2.x
Closes gh-21682
2020-06-05 12:52:24 +01:00
Andy Wilkinson
20f0b41099 Upgrade CI to Docker 19.03.9
Closes gh-21681
2020-06-05 12:48:49 +01:00
Phillip Webb
10fdd65063 Add prepare-forward-merge script
Add a git hook script that can be used to prepare a sensible merge
commit message.

Closes gh-21688
2020-06-04 20:10:09 -07:00
Phillip Webb
39caf45155 Allow forward merge to work with .x patterns
Closes gh-21687
2020-06-04 20:05:17 -07:00