a1e7375fc0
Polish
2021-11-15 13:03:10 +00:00
2d7e0314f3
Merge branch '2.5.x'
...
# Conflicts:
# spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
# spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
2021-11-15 12:51:43 +00:00
0aae9c26da
Test our Gradle plugin against Gradle 7.3
...
Closes gh-28679
2021-11-15 12:47:51 +00:00
b1ff60c728
Merge branch '2.5.x'
...
Closes gh-28681
2021-11-15 12:09:06 +00:00
4cfbc0db36
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28680
2021-11-15 12:08:49 +00:00
9de9983e25
Fix @deprecated and @see in Archive's javadoc
...
See gh-28677
2021-11-15 12:07:22 +00:00
d6bead1a2a
Expose RestClientBuilder when RestHighLevelClient is not available
...
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.
Fixes gh-28655
2021-11-15 09:59:20 +01:00
6e06e69bba
Merge branch '2.5.x'
...
Closes gh-28673
2021-11-14 08:25:01 +01:00
4c193a1511
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28672
2021-11-14 08:24:48 +01:00
d21c48e474
Update copyright year of changed file
...
See gh-28532
2021-11-14 08:23:32 +01:00
d817029575
Harmonize @ConditionalOnMissingBean definition
...
See gh-28532
2021-11-14 08:19:43 +01:00
854d8723cc
Upgrade to Spring Data 2021.1.0
...
Closes gh-28517
2021-11-13 16:22:40 +01:00
818abdc70d
Upgrade to Spring HATEOAS 1.4.0
...
Closes gh-28610
2021-11-13 16:22:05 +01:00
113a7bd525
Upgrade to Neo4j Java Driver 4.3.6
...
Closes gh-28667
2021-11-13 16:21:43 +01:00
83151a3a72
Upgrade to MongoDB 4.4.0
...
Closes gh-28666
2021-11-13 16:21:42 +01:00
7f3cff062d
Upgrade to Elasticsearch 7.15.2
...
Closes gh-28665
2021-11-13 16:21:40 +01:00
e638ded7e9
Upgrade to Couchbase Client 3.2.3
...
Closes gh-28664
2021-11-13 16:21:39 +01:00
e396aa310f
Upgrade to Spring Data 2021.0.7
...
Closes gh-28512
2021-11-13 16:17:57 +01:00
52098229c0
Upgrade to Spring HATEOAS 1.3.6
...
Closes gh-28609
2021-11-13 16:17:35 +01:00
e7d62ffb01
Upgrade to Spring Data 2020.0.15
...
Closes gh-28508
2021-11-13 16:16:51 +01:00
f3e2a40424
Upgrade to Spring HATEOAS 1.2.11
...
Closes gh-28608
2021-11-13 16:16:17 +01:00
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
3ba8184cb1
Merge branch '2.5.x'
...
Closes gh-28660
2021-11-12 20:04:09 +00:00
ef02db9ed1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28659
2021-11-12 20:03:53 +00:00
0889cdd516
Add dependency management for Glassfish JSTL
...
To be used in place of javax.servlet:jstl
Closes gh-28657
2021-11-12 20:03:15 +00:00
303dd4cfe0
Upgrade to Micrometer 1.8.0
...
Closes gh-28516
2021-11-12 10:14:04 +01:00
5f1103f381
Add missing @Deprecated annotation
...
Closes gh-28602
2021-11-11 12:03:33 +00:00
925ddd6b09
Merge branch '2.5.x'
2021-11-11 10:34:13 +00:00
3b180f42b7
Polish
2021-11-11 10:34:04 +00:00
6fa523ed6f
Start building against Spring HATEOAS 1.4.0 snapshots
...
See gh-28610
2021-11-11 10:01:37 +00:00
1d1ab21ac3
Start building against Spring HATEOAS 1.3.6 snapshots
...
See gh-28609
2021-11-11 10:00:37 +00:00
ede3e4e6a0
Start building against Spring HATEOAS 1.2.11 snapshots
...
See gh-28608
2021-11-11 09:59:05 +00:00
7a24ee88ae
Merge branch '2.5.x'
...
Closes gh-28607
2021-11-11 09:55:42 +00:00
23197c34c7
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28606
2021-11-11 09:55:21 +00:00
c018788846
Test JTA auto-configured from JNDI
...
Closes gh-28594
2021-11-11 09:54:50 +00:00
74c57bbefa
Upgrade to Spring Framework 5.3.13
...
Closes gh-28515
2021-11-11 10:00:04 +01:00
0b808fdd3c
Upgrade to Micrometer 1.7.6
...
Closes gh-28511
2021-11-11 09:59:21 +01:00
f969b60031
Upgrade to Spring Framework 5.3.13
...
Closes gh-28510
2021-11-11 09:57:53 +01:00
24c578e3ad
Upgrade to Micrometer 1.6.13
...
Closes gh-28507
2021-11-11 09:57:22 +01:00
c8d9f94821
Upgrade to Spring Framework 5.3.13
...
Closes gh-28506
2021-11-11 09:56:52 +01:00
ceacb1533a
Merge branch '2.5.x'
2021-11-10 20:18:09 +00:00
b5653ad551
Merge branch '2.4.x' into 2.5.x
2021-11-10 20:17:36 +00:00
f3b5e6bb3e
Adapt to removal of static resource location filtering
...
See gh-28506
2021-11-10 20:15:56 +00:00
4229039ba4
Start building against Spring AMQP 2.3.12 snapshots
...
See gh-28600
2021-11-10 19:51:53 +01:00
85e06438e3
Start building against Spring AMQP 2.3.12 snapshots
...
See gh-28599
2021-11-10 19:50:24 +01:00
508841b444
Replace "e.g." by "for example"
...
See gh-28583
2021-11-09 19:50:11 +01:00
07e3c1f565
Upgrade to Reactor 2020.0.13
...
Closes gh-28514
2021-11-09 19:44:32 +01:00
e5b168a227
Upgrade to Reactor 2020.0.13
...
Closes gh-28505
2021-11-09 19:43:48 +01:00
ab1748f06f
Upgrade to Reactor 2020.0.13
...
Closes gh-28505
2021-11-09 19:42:57 +01:00
c27a77341e
Upgrade to Postgresql 42.3.1
...
Closes gh-28581
2021-11-09 08:51:40 +01:00
5c86823548
Upgrade to Netty tcNative 2.0.45.Final
...
Closes gh-28580
2021-11-09 08:51:40 +01:00
ac1f85011b
Upgrade to Netty 4.1.70.Final
...
Closes gh-28579
2021-11-09 08:51:40 +01:00
5442b36982
Upgrade to Neo4j Java Driver 4.3.5
...
Closes gh-28578
2021-11-09 08:51:39 +01:00
653c3424f3
Upgrade to Johnzon 1.2.15
...
Closes gh-28576
2021-11-09 08:51:39 +01:00
b33a99ce15
Upgrade to HttpClient5 5.1.1
...
Closes gh-28575
2021-11-09 08:51:39 +01:00
e7e7158ab8
Upgrade to Hibernate 5.6.1.Final
...
Closes gh-28574
2021-11-09 08:51:39 +01:00
179b9136ad
Upgrade to Gson 2.8.9
...
Closes gh-28573
2021-11-09 08:51:38 +01:00
629e1d3ac5
Upgrade to Flyway 8.0.3
...
Closes gh-28572
2021-11-09 08:51:38 +01:00
bbb9a0df12
Upgrade to Byte Buddy 1.11.22
...
Closes gh-28571
2021-11-09 07:29:33 +01:00
4a88a5fb07
Upgrade to Awaitility 4.1.1
...
Closes gh-28570
2021-11-09 07:29:32 +01:00
21c5f46182
Upgrade to AppEngine SDK 1.9.92
...
Closes gh-28569
2021-11-09 07:29:31 +01:00
3422b1f38b
Replace "refer to" with "see"
...
Update documentation to replace "refer to" with "see" and to drop
"please" when it is present.
See gh-28537
2021-11-08 14:40:57 -08:00
9f2c8f65ee
Replace "check out" with more formal language
...
Update documentation to use more formal language rather than
"check out".
See gh-28503
2021-11-08 14:36:32 -08:00
c7e61e448e
Polish "Remove 'etc' in reference documentation"
...
See gh-28497
2021-11-08 13:27:24 -08:00
0d025b672e
Remove 'etc' in reference documentation
...
Update the reference documentation to replace 'etc' with 'other'.
See gh-28497
2021-11-08 13:24:33 -08:00
d8629fc63d
Merge branch '2.5.x'
2021-11-08 13:14:52 -08:00
ddd38a7ac3
Merge branch '2.4.x' into 2.5.x
2021-11-08 13:14:35 -08:00
75bf430eb1
Polish ImportsContextCustomizerTests
...
Update the test classes to include an `@Import` annotation. Without this
the tests would not fail even if the filter is missing.
2021-11-08 13:13:04 -08:00
0a6991e744
Merge branch '2.5.x'
...
Closes gh-28566
2021-11-08 13:11:03 -08:00
6406ee5609
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28565
2021-11-08 13:08:52 -08:00
8a14e1e2e9
Polish 'Ignore JUnit annotations when caching test contexts'
...
See gh-28563
2021-11-08 13:07:26 -08:00
23876d8a32
Ignore JUnit annotations when caching test contexts
...
Update `ImportsContextCustomizer` to ignore JUnit annotations.
See gh-28563
2021-11-08 13:06:23 -08:00
59151616eb
Switch bomr policy to same-minor-version
2021-11-08 09:37:38 +01:00
f37406f7b1
Upgrade to Netty tcNative 2.0.45.Final
...
Closes gh-28561
2021-11-08 08:59:23 +01:00
4c8dbd7469
Upgrade to Netty 4.1.70.Final
...
Closes gh-28560
2021-11-08 08:59:22 +01:00
92193caff6
Upgrade to Johnzon 1.2.15
...
Closes gh-28559
2021-11-08 08:59:21 +01:00
019971f375
Upgrade to Hazelcast 4.1.6
...
Closes gh-28558
2021-11-08 08:59:20 +01:00
388f8a33a5
Upgrade to Gson 2.8.9
...
Closes gh-28557
2021-11-08 08:59:19 +01:00
c8a1734e0f
Upgrade to AppEngine SDK 1.9.92
...
Closes gh-28556
2021-11-08 08:59:18 +01:00
e802d6b102
Upgrade to Netty tcNative 2.0.45.Final
...
Closes gh-28555
2021-11-08 08:32:07 +01:00
c14b07717c
Upgrade to Netty 4.1.70.Final
...
Closes gh-28554
2021-11-08 08:32:05 +01:00
e06bb693f8
Upgrade to Johnzon 1.2.15
...
Closes gh-28553
2021-11-08 08:32:04 +01:00
2584463fed
Upgrade to Gson 2.8.9
...
Closes gh-28552
2021-11-08 08:32:03 +01:00
c5830b083c
Upgrade to AppEngine SDK 1.9.92
...
Closes gh-28551
2021-11-08 08:32:02 +01:00
98d3e99ac9
Merge branch '2.5.x'
...
Closes gh-28550
2021-11-08 08:29:56 +01:00
91f7ff3ba3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28549
2021-11-08 08:29:43 +01:00
188278ae4a
Polish "Fix typo"
...
See gh-28548
2021-11-08 08:29:11 +01:00
5a121197fc
Fix typo
...
See gh-28548
2021-11-08 08:28:28 +01:00
c05223d9c8
Merge branch '2.5.x'
...
Closes gh-28545
2021-11-06 12:06:14 +01:00
4304eea319
Polish contribution
...
See gh-28531
2021-11-06 12:03:22 +01:00
7d594aa301
Avoid duplicate AOP proxy class definition with FilteredClassLoader
...
See gh-28531
2021-11-06 11:58:28 +01:00
bf88405121
Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure
...
Closes gh-28540
2021-11-05 14:20:37 +01:00
11a5055b8f
Merge branch '2.5.x'
2021-11-05 13:45:01 +01:00
cd5508a679
Polish
2021-11-05 13:43:38 +01:00
86bb8de815
Start building against Spring Batch 4.3.4 snapshots
...
See gh-28261
2021-11-05 13:37:30 +01:00
1c68a3460d
Start building against Spring Session 2021.1.0 snapshots
...
See gh-28522
2021-11-05 13:37:30 +01:00
1ae4691a98
Start building against Spring Integration 5.5.6 snapshots
...
See gh-28521
2021-11-05 13:37:30 +01:00
c618e7c279
Start building against Spring Security 5.6.0 snapshots
...
See gh-28520
2021-11-05 13:37:30 +01:00
94a99c1167
Start building against Spring Kafka 2.8.0 snapshots
...
See gh-28519
2021-11-05 13:37:29 +01:00
a5a33fc4bf
Start building against Spring AMQP 2.4.0 snapshots
...
See gh-28518
2021-11-05 13:37:29 +01:00
7eb1acb5e1
Start building against Spring Data 2021.1.0 snapshots
...
See gh-28517
2021-11-05 13:37:29 +01:00
9dd4c8588d
Start building against Micrometer 1.8.0 snapshots
...
See gh-28516
2021-11-05 13:37:29 +01:00
98b9e1ab21
Start building against Spring Framework 5.3.13 snapshots
...
See gh-28515
2021-11-05 13:37:29 +01:00
71151c27e7
Start building against Reactor 2020.0.13 snapshots
...
See gh-28514
2021-11-05 11:08:55 +01:00
79c9d21926
Start building against Spring Batch 4.3.4 snapshots
...
See gh-28250
2021-11-05 10:44:30 +01:00
45deb1ac56
Start building against Spring Kafka 2.7.9 snapshots
...
See gh-28539
2021-11-05 10:43:59 +01:00
6984d80389
Start building against Spring Integration 5.5.6 snapshots
...
See gh-28513
2021-11-05 10:43:28 +01:00
b9e1bf6b1a
Start building against Spring Data 2021.0.7 snapshots
...
See gh-28512
2021-11-05 10:43:00 +01:00
d36c0f21b3
Start building against Micrometer 1.7.6 snapshots
...
See gh-28511
2021-11-05 10:42:34 +01:00
71fb6ef9e1
Start building against Spring Framework 5.3.13 snapshots
...
See gh-28510
2021-11-05 10:42:04 +01:00
8426fd9488
Start building against Reactor 2020.0.13 snapshots
...
See gh-28509
2021-11-05 10:41:39 +01:00
190d39a4f9
Start building against Spring Batch 4.3.4 snapshots
...
See gh-28230
2021-11-05 10:06:58 +01:00
5c995a2d9b
Start building against Spring Data 2020.0.15 snapshots
...
See gh-28508
2021-11-05 10:06:27 +01:00
176496bd18
Start building against Micrometer 1.6.13 snapshots
...
See gh-28507
2021-11-05 10:05:38 +01:00
7ae68b6ccc
Start building against Spring Framework 5.3.13 snapshots
...
See gh-28506
2021-11-05 10:05:11 +01:00
d887e438eb
Start building against Reactor 2020.0.13 snapshots
...
See gh-28505
2021-11-05 10:04:46 +01:00
fbe614a61b
Fix bean type visibility
...
See gh-28437
2021-11-02 14:41:32 +01:00
2be0161f9a
Fix bean type visibility
...
See gh-28437
2021-11-02 12:35:19 +01:00
73e9c355f1
Polish
...
See gh-28501
2021-11-02 09:05:44 +01:00
7ad60df844
Merge branch '2.5.x'
2021-11-02 09:05:11 +01:00
06e9991e6a
Polish
...
See gh-28501
2021-11-02 09:04:32 +01:00
3e1bc01839
Fix whenThereIsNoMeterRegistryThenClientResourcesCustomizationBacksOff()
...
See gh-28492
2021-11-01 09:00:19 +01:00
5d8dce70dc
Polish
...
See gh-28494
2021-11-01 08:58:40 +01:00
875479abeb
Merge branch '2.5.x'
...
Closes gh-28490
2021-10-29 15:52:18 +01:00
33249e9414
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28489
2021-10-29 15:52:08 +01:00
12d8f942be
Stop logging to the file used in the generated documentation
...
Closes gh-28488
2021-10-29 15:51:32 +01:00
e54b876536
Merge branch '2.5.x'
...
Closes gh-28487
2021-10-29 15:50:01 +01:00
5e42f27b36
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28486
2021-10-29 15:49:49 +01:00
e4e1958b65
Make Logback fall back to JVM's default charset
...
The charset "default" is an alias for US-ASCII, not the JVM's default
charset. This commit updates the built-in Logback configuration to
use Charset.defaultCharset().name() in place of "default" in the
Java-based configuration. In the XML-based configuration where
Charset.defaultCharset().name() cannot be called, we emulate its
behaviour [1] by using the file.encoding system property, falling back
to UTF-8 when it's not set.
Fixes gh-27230
[1] 19be6113dd/jdk/src/share/classes/java/nio/charset/Charset.java (L604-L617)
2021-10-29 14:40:05 +01:00
ef2bcdd3ed
Merge branch '2.5.x'
...
Closes gh-28483
2021-10-29 11:37:43 +01:00
07ed7ab944
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28482
2021-10-29 11:37:33 +01:00
2462f67be4
Align test for spring.data.mongodb.autoIndexCreation with new default
...
Closes gh-28481
2021-10-29 11:23:35 +01:00
c9dd6b7e86
Merge branch '2.5.x'
...
Closes gh-28480
2021-10-29 11:12:18 +01:00
ae93bb3a11
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28479
2021-10-29 11:12:04 +01:00
10f0017d69
Fix method validation in child contexts
...
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.
This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.
Fixes gh-27890
2021-10-29 10:08:57 +01:00
4a15a816ce
Polish 'Replace "via" with words more suited to an international audience'
...
See gh-28464
2021-10-28 19:22:11 +01:00
73a18c73f4
Replace "via" with words more suited to an international audience
...
See gh-28464
2021-10-28 17:54:14 +01:00
9241f228d5
Add .gitattributes
...
Closes gh-28474
2021-10-28 15:31:40 +02:00
66553ac8c7
Add .gitattributes
...
Closes gh-28473
2021-10-28 15:27:49 +02:00
1b3f52d609
Harmonize line endings
...
See gh-27615
2021-10-28 15:22:57 +02:00
24ef4e6fb9
Merge branch '2.5.x'
...
Closes gh-28471
2021-10-28 13:07:22 +01:00
7fbbb4e08a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28470
2021-10-28 13:07:07 +01:00
72f80f3ae6
Upgrade to Testcontainers 1.16.1
...
Closes gh-28468
2021-10-28 13:06:41 +01:00
e340429a1a
Merge branch '2.5.x'
...
Closes gh-28469
2021-10-28 12:50:23 +01:00
b375f9fac0
Ignore parameters when checking if */* is accepted
...
Previously the parameters were not ignored so */*;q=0.8 was not
identified as accepting */*. As a result, the most recent producible
content type was returned rather than the default.
This commit updates the argument resolver to ignore parameters.
The default content type is now produced in response to a request
that accepts */*, irrespective of its parameters.
Fixes gh-28446
2021-10-28 12:27:34 +01:00
ea8a8ecd0e
Merge branch '2.5.x'
...
Closes gh-28467
2021-10-28 11:53:34 +02:00
ce38d592f9
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28466
2021-10-28 11:53:19 +02:00
265199f42b
Polish "Fix description of "logging.logback.rollingpolicy.max-history""
...
See gh-28448
2021-10-28 11:50:38 +02:00
Andy Wilkinson
Leo Li
Filip Hrisafov
Stephane Nicoll
Josh Cummings
Jay Bryant
Phillip Webb
Loïc Ledoyen
slowjoe007
dreis2211
izeye