Commit Graph

50613 Commits

Author SHA1 Message Date
Abhijeet Mishra
35994bbd74 Add support for additional colors in Log4j2 and Logback
See gh-34749
2023-04-05 14:49:03 +02:00
Stephane Nicoll
e7647a6bcd Merge branch '3.0.x' 2023-04-05 14:20:10 +02:00
Stephane Nicoll
2f54a0c77f Merge branch '2.7.x' into 3.0.x 2023-04-05 14:19:34 +02:00
Stephane Nicoll
6ee6d06419 Start building against Spring Framework 6.0.8 snapshots
See gh-34865
2023-04-05 14:12:48 +02:00
Stephane Nicoll
82100fa7aa Start building against Reactor Bom 2022.0.6 snapshots
See gh-34864
2023-04-05 14:12:43 +02:00
Stephane Nicoll
02781b965d Start building against Micrometer Tracing 1.1.0 snapshots
See gh-34863
2023-04-05 14:12:38 +02:00
Stephane Nicoll
877f95d528 Start building against Micrometer 1.11.0 snapshots
See gh-34862
2023-04-05 14:12:32 +02:00
Stephane Nicoll
cbf67b1c9a Start building against Spring Framework 6.0.8 snapshots
See gh-34861
2023-04-05 13:50:08 +02:00
Stephane Nicoll
3812cb1b44 Start building against Reactor Bom 2022.0.6 snapshots
See gh-34860
2023-04-05 13:50:04 +02:00
Stephane Nicoll
cc213a5424 Start building against Micrometer Tracing 1.0.4 snapshots
See gh-34859
2023-04-05 13:49:59 +02:00
Stephane Nicoll
bca565bc17 Start building against Micrometer 1.10.6 snapshots
See gh-34858
2023-04-05 13:49:54 +02:00
Stephane Nicoll
6c4809f54b Start building against Spring Framework 5.3.27 snapshots
See gh-34857
2023-04-05 13:31:49 +02:00
Stephane Nicoll
a51dff9ef1 Start building against Reactor Bom 2020.0.31 snapshots
See gh-34856
2023-04-05 13:31:44 +02:00
Stephane Nicoll
f965eff735 Start building against Micrometer 1.9.10 snapshots
See gh-34855
2023-04-05 13:31:38 +02:00
Andy Wilkinson
be014ca7e0 Merge branch '3.0.x'
Closes gh-34800
2023-03-28 14:57:16 +01:00
Andy Wilkinson
16b126a481 Merge branch '2.7.x' into 3.0.x
Closes gh-34799
2023-03-28 14:44:33 +01:00
Andy Wilkinson
c9e69b13b1 Resolve placeholders in reference config against all other config
Fixes gh-34643
2023-03-28 14:43:53 +01:00
Andy Wilkinson
bb0ec34e7b Resolve placeholders in reference config against all other config
Fixes gh-34643
2023-03-28 14:28:16 +01:00
Andy Wilkinson
1aaf498bb9 Merge branch '3.0.x'
Closes gh-34797
2023-03-28 13:47:32 +01:00
Andy Wilkinson
c37ff8d687 Merge branch '2.7.x' into 3.0.x
Closes gh-34798
2023-03-28 13:47:12 +01:00
Andy Wilkinson
0ed73a859b Upgrade to Spring Asciidoctor Backends 0.0.5
Closes gh-34432
2023-03-28 13:23:12 +01:00
Andy Wilkinson
c33906be11 Merge pull request #34759 from isabek
* gh-34759:
  Document requirement for Maven 3.6.3 and later

Closes gh-34759
2023-03-28 11:36:00 +01:00
Isabek Tashiev
e186d441ed Document requirement for Maven 3.6.3 and later
See gh-34759
2023-03-28 11:34:45 +01:00
Andy Wilkinson
d8d6cb7323 Improve diagnostics with @ServiceConnection on non-static field
Closes gh-34795
2023-03-28 10:44:17 +01:00
Andy Wilkinson
2267430bdb Find service connections declaring in enclosing classes
Fixes gh-34790
2023-03-28 10:24:11 +01:00
Andy Wilkinson
cd5d923910 Merge branch '3.0.x'
Closes gh-34793
2023-03-28 10:22:12 +01:00
Andy Wilkinson
b2e6db544b Merge branch '2.7.x' into 3.0.x
Closes gh-34792
2023-03-28 10:21:47 +01:00
Andy Wilkinson
a3135b49c3 Merge pull request #34764 from krzyk
* gh-34764:
  Polish "Fix support for default values in banner placeholders"
  Fix support for default values in banner placeholders

Closes gh-34764
2023-03-28 10:20:23 +01:00
Andy Wilkinson
2d280bb967 Polish "Fix support for default values in banner placeholders"
See gh-34764
2023-03-28 09:57:22 +01:00
Krzysztof Krason
5c01aa719c Fix support for default values in banner placeholders
See gh-34764
2023-03-28 09:53:52 +01:00
Andy Wilkinson
29193c4b9e Merge branch '3.0.x'
Closes gh-34789
2023-03-28 09:33:55 +01:00
Andy Wilkinson
4b58eefe7b Merge branch '2.7.x' into 3.0.x
Closes gh-34788
2023-03-28 09:33:41 +01:00
Andy Wilkinson
4705e82a6e Note that optional dependencies are included by run and repackage
Closes gh-34636
2023-03-28 09:33:06 +01:00
Andy Wilkinson
f62668dfe1 Add Authorization Server starter to spring-boot-dependencies
Fixes gh-34785
2023-03-28 09:28:30 +01:00
Andy Wilkinson
cd17d92eac Merge branch '3.0.x'
Closes gh-34782
2023-03-27 18:05:26 +01:00
Andy Wilkinson
d6dbf300ab Merge branch '2.7.x' into 3.0.x
Closes gh-34781
2023-03-27 18:05:03 +01:00
Andy Wilkinson
5669ea69d0 Consider properties on outer class in nested sliced tests
Prior to this commit, properties configured using the properties
attribute of a `@…Test` sliced test annotation would not be considered
when processed a `@Nested` test class. This would lead to the nested
class not reusing its outer class's application context due to the
two having different property configuration.

Fixes gh-33317
2023-03-27 17:58:51 +01:00
Andy Wilkinson
d69335d94a Use driver class name from JdbcConnectionDetails
Fixes gh-34777
2023-03-27 11:39:28 +01:00
Andy Wilkinson
b91f814e42 Fix incomplete assertions
See gh-34503
2023-03-24 16:48:45 +00:00
Andy Wilkinson
7828fbfdab Merge branch '3.0.x'
Closes gh-34756
2023-03-24 16:03:15 +00:00
Andy Wilkinson
d4ef5dc151 Merge branch '2.7.x' into 3.0.x
Closes gh-34755
2023-03-24 16:03:02 +00:00
Andy Wilkinson
17a4d303f8 Switch Java 20 CI to Bellsoft Liberica
Closes gh-34752
2023-03-24 15:59:45 +00:00
Andy Wilkinson
e8e29ecfb8 Merge branch '3.0.x'
Closes gh-34754
2023-03-24 15:54:56 +00:00
Andy Wilkinson
1933e9a28e Merge branch '2.7.x' into 3.0.x
Closes gh-34753
2023-03-24 15:54:27 +00:00
Andy Wilkinson
04e7e70ebd Remove JDK 19 CI
Closes gh-34639
2023-03-24 15:47:06 +00:00
Andy Wilkinson
718e2ff276 Merge branch '3.0.x'
Closes gh-34720
2023-03-24 15:37:23 +00:00
Andy Wilkinson
1da4271f81 Merge branch '2.7.x' into 3.0.x
Closes gh-34721
2023-03-24 15:37:00 +00:00
Andy Wilkinson
e79ac4b24e Upgrade CI images to ubuntu:jammy-20230308
Closes gh-34719
2023-03-24 15:36:02 +00:00
Andy Wilkinson
54a623f4c9 Merge branch '3.0.x'
Closes gh-34751
2023-03-24 15:34:32 +00:00
Andy Wilkinson
042c8e94a9 Merge branch '2.7.x' into 3.0.x
Closes gh-34750
2023-03-24 15:34:08 +00:00