Andy Wilkinson
0074d621d0
Merge branch '2.5.x'
...
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson
015cf920da
Name custom task inputs
...
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson
258222781a
Merge branch '2.5.x'
...
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson
96d98a0f6f
Declare dir task inputs with relative path sensitivity
...
Closes gh-28751
2021-11-19 14:29:29 +00:00
Andy Wilkinson
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson
4a0fa62d2e
Polish "Replace "you're""
...
See gh-28710
2021-11-19 13:24:17 +00:00
Jay Bryant
e629e77b29
Replace "you're"
...
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.
Also checked for words that end with "'ll" and "n't" but did not find
any.
See gh-28710
2021-11-19 13:23:10 +00:00
Andy Wilkinson
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Madhura Bhave
dd1d1482dc
Deny unauthorized access to the error page
...
Fixes gh-26356
Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
Andy Wilkinson
29725ec68a
Update links to Spring Security's reference docs
...
Closes gh-28618
2021-11-18 11:59:48 +00:00
Madhura Bhave
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
2021-11-17 16:41:23 -08:00
Madhura Bhave
64270eca51
Convert environment used by SpringBootTestContextLoader
...
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.
The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.
Fixes gh-28530
2021-11-17 16:40:53 -08:00
Stephane Nicoll
7fbb9d471b
Polish "Upgrade to Neo4j Java Driver 4.2.8"
...
See gh-28717
2021-11-17 16:14:25 +01:00
Stephane Nicoll
a6163f6acf
Upgrade to Netty tcNative 2.0.46.Final
...
Closes gh-28720
2021-11-17 15:03:59 +01:00
Stephane Nicoll
fc69be302a
Upgrade to HttpClient5 5.1.2
...
Closes gh-28719
2021-11-17 15:03:57 +01:00
Stephane Nicoll
f33c8f6fde
Upgrade to Netty tcNative 2.0.46.Final
...
Closes gh-28718
2021-11-17 15:02:27 +01:00
Stephane Nicoll
9dd599c9e3
Upgrade to Neo4j Java Driver 4.2.8
...
Closes gh-28717
2021-11-17 15:02:25 +01:00
Stephane Nicoll
ba3d0d7771
Upgrade to Spring Session 2021.1.0
...
Closes gh-28522
2021-11-17 14:14:08 +01:00
Andy Wilkinson
ea0613c7d7
Merge branch '2.5.x'
...
Closes gh-28261
2021-11-17 10:07:18 +00:00
Andy Wilkinson
416a133fd1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28250
2021-11-17 10:06:41 +00:00
Andy Wilkinson
838533ef0e
Upgrade to Spring Batch 4.3.4
...
Closes gh-28230
2021-11-17 10:04:51 +00:00
Stephane Nicoll
afa006986b
Merge branch '2.5.x'
...
Closes gh-28713
2021-11-17 09:01:53 +01:00
Vedran Pavic
c8dd0a584b
Fix "Configure Two DataSources" example
...
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.
This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.
See gh-28712
2021-11-17 09:00:14 +01:00
Stephane Nicoll
d88658d47a
Remove dependencies on micrometer-jersey2
...
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll
37864f6e66
Upgrade to Spring Integration 5.5.6
...
Closes gh-28521
2021-11-17 08:51:20 +01:00
Stephane Nicoll
6325df2055
Upgrade to Spring Integration 5.5.6
...
Closes gh-28513
2021-11-17 08:50:32 +01:00
Stephane Nicoll
f1991d8d80
Avoid bean override with CachingMetadataReaderFactoryPostProcessor
...
Closes gh-28705
2021-11-16 16:24:32 +01:00
Stephane Nicoll
dbcd0524a5
Upgrade to Logback 1.2.7
...
Closes gh-28699
2021-11-16 11:02:02 +01:00
Stephane Nicoll
8356204430
Upgrade to Flyway 8.0.4
...
Closes gh-28697
2021-11-16 11:02:02 +01:00
Stephane Nicoll
4b64f36356
Upgrade to Spring Security 5.6.0
...
Closes gh-28520
2021-11-16 09:43:30 +01:00
Stephane Nicoll
4fcb772f37
Upgrade to Logback 1.2.7
...
Closes gh-28695
2021-11-16 09:08:15 +01:00
Stephane Nicoll
c4eea99608
Upgrade to Kafka 2.7.2
...
Closes gh-28694
2021-11-16 09:08:14 +01:00
Stephane Nicoll
44b644c770
Merge branch '2.5.x'
...
Closes gh-28693
2021-11-16 08:59:58 +01:00
Stephane Nicoll
9ed7674ab0
Polish "Fix yaml sample format"
...
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun
7f1bd43c84
Fix yaml sample format
...
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll
6d4537b5ae
Merge branch '2.5.x'
...
Closes gh-28692
2021-11-16 08:50:53 +01:00
Stephane Nicoll
6d79599d99
Polish "Fix yaml sample format in reference doc"
...
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun
793a107d27
Fix yaml sample format in reference doc
...
See gh-28670
2021-11-16 08:45:50 +01:00
Stephane Nicoll
cdc14250c4
Merge branch '2.5.x'
...
Closes gh-28691
2021-11-16 08:34:39 +01:00
izeye
e56efc03f6
Update URL for GraphQL Spring Boot starter
...
See gh-28683
2021-11-16 08:33:56 +01:00
Stephane Nicoll
52ecc1e0dd
Polish "Create EndpointWebExtension only if necessary"
...
See gh-28475
2021-11-16 08:22:35 +01:00
davidh44
b658013a97
Create EndpointWebExtension only if necessary
...
This commit updates Actuator's EndpointWebExtensions to be created only
if the related endpoint is exposed over HTTP.
See gh-28475
2021-11-16 08:15:19 +01:00
Stephane Nicoll
a4c5f07391
Upgrade to Spring Kafka 2.8.0
...
Closes gh-28519
2021-11-15 19:58:47 +01:00
Stephane Nicoll
d058af5be2
Upgrade to Spring AMQP 2.4.0
...
Closes gh-28518
2021-11-15 19:58:29 +01:00
Stephane Nicoll
882c58b1f1
Upgrade to Spring Kafka 2.7.9
...
Closes gh-28539
2021-11-15 19:57:41 +01:00
Stephane Nicoll
d3c5563e60
Upgrade to Spring AMQP 2.3.12
...
Closes gh-28600
2021-11-15 19:57:15 +01:00
Scott Frederick
8903c69b19
Avoid exposing time-related task metrics
...
Fixes gh-28535
2021-11-15 12:24:50 -06:00
Scott Frederick
d7f8931dd4
Make TaskExecution and TaskScheduling metrics unique
...
Fixes gh-28536
2021-11-15 12:23:25 -06:00
Andy Wilkinson
a1e7375fc0
Polish
2021-11-15 13:03:10 +00:00
Andy Wilkinson
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
Andy Wilkinson
0aae9c26da
Test our Gradle plugin against Gradle 7.3
...
Closes gh-28679
2021-11-15 12:47:51 +00:00
Andy Wilkinson
b1ff60c728
Merge branch '2.5.x'
...
Closes gh-28681
2021-11-15 12:09:06 +00:00
Andy Wilkinson
4cfbc0db36
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28680
2021-11-15 12:08:49 +00:00
Leo Li
9de9983e25
Fix @deprecated and @see in Archive's javadoc
...
See gh-28677
2021-11-15 12:07:22 +00:00
Filip Hrisafov
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
Stephane Nicoll
6e06e69bba
Merge branch '2.5.x'
...
Closes gh-28673
2021-11-14 08:25:01 +01:00
Stephane Nicoll
4c193a1511
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28672
2021-11-14 08:24:48 +01:00
Stephane Nicoll
d21c48e474
Update copyright year of changed file
...
See gh-28532
2021-11-14 08:23:32 +01:00
Josh Cummings
d817029575
Harmonize @ConditionalOnMissingBean definition
...
See gh-28532
2021-11-14 08:19:43 +01:00
Stephane Nicoll
854d8723cc
Upgrade to Spring Data 2021.1.0
...
Closes gh-28517
2021-11-13 16:22:40 +01:00
Stephane Nicoll
818abdc70d
Upgrade to Spring HATEOAS 1.4.0
...
Closes gh-28610
2021-11-13 16:22:05 +01:00
Stephane Nicoll
113a7bd525
Upgrade to Neo4j Java Driver 4.3.6
...
Closes gh-28667
2021-11-13 16:21:43 +01:00
Stephane Nicoll
83151a3a72
Upgrade to MongoDB 4.4.0
...
Closes gh-28666
2021-11-13 16:21:42 +01:00
Stephane Nicoll
7f3cff062d
Upgrade to Elasticsearch 7.15.2
...
Closes gh-28665
2021-11-13 16:21:40 +01:00
Stephane Nicoll
e638ded7e9
Upgrade to Couchbase Client 3.2.3
...
Closes gh-28664
2021-11-13 16:21:39 +01:00
Stephane Nicoll
e396aa310f
Upgrade to Spring Data 2021.0.7
...
Closes gh-28512
2021-11-13 16:17:57 +01:00
Stephane Nicoll
52098229c0
Upgrade to Spring HATEOAS 1.3.6
...
Closes gh-28609
2021-11-13 16:17:35 +01:00
Stephane Nicoll
e7d62ffb01
Upgrade to Spring Data 2020.0.15
...
Closes gh-28508
2021-11-13 16:16:51 +01:00
Stephane Nicoll
f3e2a40424
Upgrade to Spring HATEOAS 1.2.11
...
Closes gh-28608
2021-11-13 16:16:17 +01:00
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson
3ba8184cb1
Merge branch '2.5.x'
...
Closes gh-28660
2021-11-12 20:04:09 +00:00
Andy Wilkinson
ef02db9ed1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28659
2021-11-12 20:03:53 +00:00
Andy Wilkinson
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
Stephane Nicoll
303dd4cfe0
Upgrade to Micrometer 1.8.0
...
Closes gh-28516
2021-11-12 10:14:04 +01:00
Andy Wilkinson
5f1103f381
Add missing @Deprecated annotation
...
Closes gh-28602
2021-11-11 12:03:33 +00:00
Andy Wilkinson
925ddd6b09
Merge branch '2.5.x'
2021-11-11 10:34:13 +00:00
Andy Wilkinson
3b180f42b7
Polish
2021-11-11 10:34:04 +00:00
Andy Wilkinson
6fa523ed6f
Start building against Spring HATEOAS 1.4.0 snapshots
...
See gh-28610
2021-11-11 10:01:37 +00:00
Andy Wilkinson
1d1ab21ac3
Start building against Spring HATEOAS 1.3.6 snapshots
...
See gh-28609
2021-11-11 10:00:37 +00:00
Andy Wilkinson
ede3e4e6a0
Start building against Spring HATEOAS 1.2.11 snapshots
...
See gh-28608
2021-11-11 09:59:05 +00:00
Andy Wilkinson
7a24ee88ae
Merge branch '2.5.x'
...
Closes gh-28607
2021-11-11 09:55:42 +00:00
Andy Wilkinson
23197c34c7
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28606
2021-11-11 09:55:21 +00:00
Andy Wilkinson
c018788846
Test JTA auto-configured from JNDI
...
Closes gh-28594
2021-11-11 09:54:50 +00:00
Stephane Nicoll
74c57bbefa
Upgrade to Spring Framework 5.3.13
...
Closes gh-28515
2021-11-11 10:00:04 +01:00
Stephane Nicoll
0b808fdd3c
Upgrade to Micrometer 1.7.6
...
Closes gh-28511
2021-11-11 09:59:21 +01:00
Stephane Nicoll
f969b60031
Upgrade to Spring Framework 5.3.13
...
Closes gh-28510
2021-11-11 09:57:53 +01:00
Stephane Nicoll
24c578e3ad
Upgrade to Micrometer 1.6.13
...
Closes gh-28507
2021-11-11 09:57:22 +01:00
Stephane Nicoll
c8d9f94821
Upgrade to Spring Framework 5.3.13
...
Closes gh-28506
2021-11-11 09:56:52 +01:00
Andy Wilkinson
ceacb1533a
Merge branch '2.5.x'
2021-11-10 20:18:09 +00:00
Andy Wilkinson
b5653ad551
Merge branch '2.4.x' into 2.5.x
2021-11-10 20:17:36 +00:00
Andy Wilkinson
f3b5e6bb3e
Adapt to removal of static resource location filtering
...
See gh-28506
2021-11-10 20:15:56 +00:00
Stephane Nicoll
4229039ba4
Start building against Spring AMQP 2.3.12 snapshots
...
See gh-28600
2021-11-10 19:51:53 +01:00
Stephane Nicoll
85e06438e3
Start building against Spring AMQP 2.3.12 snapshots
...
See gh-28599
2021-11-10 19:50:24 +01:00
Leo Li
508841b444
Replace "e.g." by "for example"
...
See gh-28583
2021-11-09 19:50:11 +01:00
Stephane Nicoll
07e3c1f565
Upgrade to Reactor 2020.0.13
...
Closes gh-28514
2021-11-09 19:44:32 +01:00
Stephane Nicoll
e5b168a227
Upgrade to Reactor 2020.0.13
...
Closes gh-28505
2021-11-09 19:43:48 +01:00