fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,019 Commits 22 Branches 339 Tags
Commit Graph

3176 Commits

Author SHA1 Message Date
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