heqiang
3a0ab01066
Polish "Remove boxing"
...
See gh-31197
2022-05-30 15:02:58 +02:00
Andy Wilkinson
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
cbf42dea14
Update deprecation messages to change removal version from 2.8 to 3.0
...
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson
e407bae8c8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31098
2022-05-18 13:14:15 +01:00
Andy Wilkinson
5e78bef9f8
Test security dialect auto-config without Spring Security
...
Closes gh-31097
2022-05-18 13:06:09 +01:00
Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
Andy Wilkinson
1fd9c4d82c
Polish
...
Closes gh-30992
2022-05-12 12:10:52 +01:00
izeye
624c41c80e
Polish
...
See gh-30862
2022-05-12 12:07:12 +01:00
Andy Wilkinson
c9571a04ab
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30873
2022-05-05 10:19:01 +01:00
Andy Wilkinson
6d4f0232ca
Polish "Fix ConditionalOnProperty when used in an aliased composed annotation"
...
See gh-30505
2022-05-05 10:02:27 +01:00
Guirong Hu
dc57ad54d5
Fix ConditionalOnProperty when used in an aliased composed annotation
...
See gh-30505
2022-05-05 10:02:15 +01:00
Andy Wilkinson
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
2022-05-03 15:14:00 +01:00
Andy Wilkinson
4fd2e0c916
Polish "Fix typos"
...
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson
f6d24dc1a8
Fix typos
...
See gh-30773
2022-05-03 14:09:37 +01:00
Andy Wilkinson
a8b5a1c688
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30845
2022-05-03 13:51:38 +01:00
Andy Wilkinson
026b9e2efe
Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe"
...
See gh-30705
2022-05-03 13:49:12 +01:00
dugenkui03
c8d1dfebab
Make event handling in JobExecutionExitCodeGenerator thread-safe
...
See gh-30705
2022-05-03 13:48:15 +01:00
Andy Wilkinson
bf94ea24d3
Improve testing of Batch schema resolution
...
Closes gh-30794
2022-04-25 19:30:59 +01:00
Stephane Nicoll
e735bb2fcd
Start building against Spring Framework 5.3.19 snapshots
...
See gh-30517
2022-04-09 10:01:00 +02:00
Andy Wilkinson
7e44745816
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30620
2022-04-08 21:01:48 +01:00
Andy Wilkinson
b88f062f04
Polish "Remove assumptions about ordering when comparing JSON in tests"
...
See gh-30514
2022-04-08 20:56:20 +01:00
Vivek Gupta
5b3bc1a936
Remove assumptions about ordering when comparing JSON in tests
...
See gh-30514
2022-04-08 20:55:54 +01:00
Moritz Halbritter
99a1b98e03
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30551
2022-04-06 08:56:47 +02:00
Moritz Halbritter
41ab46d0c7
Fix wrong replacement hint for 'spring.data.neo4j.username'
...
Closes gh-30550
2022-04-06 08:56:23 +02:00
Stephane Nicoll
546a7e5edb
Merge branch '2.5.x' into 2.6.x
2022-03-31 12:44:52 +02:00
Stephane Nicoll
17936b855c
Polish
2022-03-31 12:42:37 +02:00
Andy Wilkinson
64beaba99f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30475
2022-03-30 10:56:56 +01:00
Andy Wilkinson
8cb11b74cd
Polish "Make MustacheViewResolver bean back off without Spring MVC"
...
See gh-30456
2022-03-30 10:33:35 +01:00
Craig Andrews
7101b5099f
Make MustacheViewResolver bean back off without Spring MVC
...
See gh-30456
2022-03-30 10:31:44 +01:00
Moritz Halbritter
c003d5b533
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30436
2022-03-25 14:55:31 +01:00
Moritz Halbritter
0ff8119a1b
Sort entries in additional-spring-configuration metadata alphabetically
...
Closes gh-30434
2022-03-25 14:54:39 +01:00
Andy Wilkinson
c739831087
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30387
2022-03-23 12:11:02 +00:00
Andy Wilkinson
d8cf332c2e
Document default value of spring.thymeleaf.reactive.media-types
...
Closes gh-30280
2022-03-23 12:09:48 +00:00
Andy Wilkinson
f378627f94
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30385
2022-03-23 11:45:31 +00:00
Andy Wilkinson
8d882fa09b
Fix possible duplicate templateEngine bean in Thymeleaf auto-config
...
Closes gh-30384
2022-03-23 11:44:59 +00:00
Andy Wilkinson
f063da30d2
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30376
2022-03-22 20:12:48 +00:00
Andy Wilkinson
a8bddeb9cf
Remove redundant setting of refresh policy
...
Closes gh-30375
2022-03-22 20:12:09 +00:00
Stephane Nicoll
1169c6df16
Upgrade to Neo4j Java Driver 4.4.5
...
Closes gh-30326
2022-03-18 18:34:09 +01:00
Andy Wilkinson
26719a211b
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30321
2022-03-18 15:55:39 +00:00
Andy Wilkinson
1669062231
Apply server.tomcat.keep-alive-timeout to HTTP/2
...
Closes gh-30267
2022-03-18 15:38:27 +00:00
Andy Wilkinson
3c117ca2d4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30276
2022-03-17 17:50:58 +00:00
Andy Wilkinson
2b75ea5fb8
Improve testing of spring.mustache.* properties
...
Closes gh-30274
2022-03-17 17:40:22 +00:00
Andy Wilkinson
cdaafce614
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30256
2022-03-16 19:41:14 +00:00
Andy Wilkinson
7f036e35fd
Make MustacheViewResolvers conditional onspring.mustache.enabled
...
Closes gh-30250
2022-03-16 19:09:13 +00:00
Andy Wilkinson
6bc000565d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30253
2022-03-16 17:06:17 +00:00
Andy Wilkinson
0accc3d67d
Convert MustacheAutoConfigurationTests to application context runner
...
Closes gh-30252
2022-03-16 15:28:48 +00:00
Stephane Nicoll
3717c4c883
Start building against Spring Kafka 2.8.4 snapshots
...
See gh-30181
2022-03-12 12:50:26 +01:00
Andy Wilkinson
6bbf3aff0e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30164
2022-03-11 11:03:01 +00:00
Andy Wilkinson
eef89c6c35
Increase tests' Cassandra timeouts to 60s
...
Closes gh-30163
2022-03-11 11:02:18 +00:00
Andy Wilkinson
7c3c5d3d3e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30164
2022-03-10 16:51:33 +00:00
Andy Wilkinson
bbdef2b026
Increase timeouts in tests that use Cassandra
...
Closes gh-30163
2022-03-10 16:50:39 +00:00
Andy Wilkinson
3cb1629f45
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30134
2022-03-09 14:44:51 +00:00
Andy Wilkinson
da1eb25e4b
Remove redundant JRE-based enabled and disabled annotations from tests
...
Closes gh-29693
2022-03-09 14:41:13 +00:00
Andy Wilkinson
119a713f09
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30098
2022-03-08 13:52:25 +00:00
Andy Wilkinson
e7705f4f71
Improve condition message produced by @ConditionalOnSingleCandidate
...
Closes gh-30073
2022-03-08 13:51:38 +00:00
Moritz Halbritter
564555347f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30083
2022-03-07 13:22:34 +01:00
Moritz Halbritter
be38311c5d
Disable incompatible tests on Linux AArch64
...
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
@DisableOnOs annotation. This new annotation supports the architecture
and is repeatable
Closes gh-30082
2022-03-07 13:22:17 +01:00
Stephane Nicoll
c6a9e138e5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30080
2022-03-07 09:49:00 +01:00
Stephane Nicoll
cf9cc82025
Update copyright year of change file
...
See gh-30074
2022-03-07 09:47:12 +01:00
hak7a3
0a035c7fa6
Fix references to spring.data.cassandra.connection.connect-timeout
...
See gh-30074
2022-03-07 09:42:43 +01:00
Andy Wilkinson
2ef055a823
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30070
2022-03-04 17:56:14 +00:00
Andy Wilkinson
1872af056e
Make it clearer that the generated password is not for production use
...
Closes gh-30061
2022-03-04 17:55:54 +00:00
Andy Wilkinson
8a4a639734
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30033
2022-03-02 12:21:20 +00:00
izeye
140d24d567
Remove redundant ConditionalOnMissingFilterBean
...
See gh-29983
2022-03-02 11:40:44 +00:00
Andy Wilkinson
b379eea885
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30008
2022-02-28 11:15:02 +00:00
Andy Wilkinson
7bc336cdc6
Use an ephemeral port to avoid potential port clash
...
Closes gh-30007
2022-02-28 10:54:31 +00:00
Phillip Webb
9411fc264d
Merge branch '2.5.x' into 2.6.x
2022-02-23 21:44:08 -08:00
Phillip Webb
57009d5623
Polish
2022-02-23 21:43:42 -08:00
Andy Wilkinson
a979925e63
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29970
2022-02-23 11:52:57 +00:00
Andy Wilkinson
7aca75c58c
Preserve ObjectName property order when name is unchanged
...
Closes gh-29953
2022-02-23 11:30:21 +00:00
Stephane Nicoll
c8b7a17545
Upgrade to Spring Kafka 2.8.3
...
Closes gh-29722
2022-02-23 08:27:24 +01:00
Andy Wilkinson
9da6fb4a5a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29903
2022-02-18 11:42:10 +00:00
Andy Wilkinson
c676b8b84d
Remove KafkaPropertiesKafka24Tests
...
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.
Closes gh-29882
2022-02-18 11:41:24 +00:00
Andy Wilkinson
0cebb332d1
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29901
2022-02-18 11:08:21 +00:00
Andy Wilkinson
ac38a5a3e9
Update javadoc to reflect move to SecurityFilterChain
...
Closes gh-29900
2022-02-18 11:05:48 +00:00
Andy Wilkinson
b74f668254
Only auto-configure WebSessionIdResolver in reactive web app
...
Closes gh-29669
2022-02-11 12:09:45 +00:00
Andy Wilkinson
197ba9ebc9
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29731
2022-02-10 15:04:58 +00:00
Andy Wilkinson
64ee54423a
Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
...
See gh-29333
2022-02-10 15:01:57 +00:00
Guirong Hu
cec69feb95
Configure ForwardedHeaderFilter with Tomcat's use relative redirects
...
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.
This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.
See gh-29333
2022-02-10 15:01:56 +00:00
Stephane Nicoll
03d393bc4c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29649
2022-02-04 09:50:47 +01:00
Stephane Nicoll
48649192cb
Fix schema file name for Batch auto-configuration tests
...
Closes gh-29648
2022-02-04 09:49:15 +01:00
Stephane Nicoll
d130819fb4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29616
2022-02-01 16:35:19 +01:00
Stephane Nicoll
5fe6176966
Polish "Add a note on early init with @ConditionalOnExpression"
...
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu
fce3cd1684
Add a note on early init with @ConditionalOnExpression
...
See gh-29276
2022-02-01 16:24:13 +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
Phillip Webb
5b1486cc26
Merge branch '2.5.x' into 2.6.x
2022-01-19 15:54:19 -08:00
Phillip Webb
d211b0f3b3
Disable test is Docker is not available
...
See gh-28843
2022-01-19 15:53:07 -08:00
Andy Wilkinson
6bea2172cb
Switch tests to properties that are not deprecated
...
Closes gh-29488
2022-01-19 19:08:31 +00:00
Andy Wilkinson
ee9c399eba
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29485
2022-01-19 17:27:36 +00:00
Andy Wilkinson
1b3d088056
Move JdbcSessionDataSourceInitializerTests into src/test/java
...
Closes gh-29484
2022-01-19 17:26:55 +00:00
Andy Wilkinson
8868d34c24
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29399
2022-01-14 15:48:57 +00:00
Andy Wilkinson
d051146eb4
Use Testcontainers instead on Embedded Mongo
...
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.
Closes gh-28843
2022-01-14 15:48:31 +00:00
izeye
7fbb5749d1
Polish
...
See gh-29157
2021-12-27 12:01:50 +01:00
Stephane Nicoll
653fdbd0a4
Configure comment prefixes
...
Closes gh-29095
2021-12-20 17:47:50 +01:00
Phillip Webb
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
Stephane Nicoll
55859ea64c
Stop accessing the datasource if initialization mode is set to never
...
Closes gh-28931
2021-12-16 16:50:22 +01:00