1bb3f906a7
Polish
...
See gh-28836
2021-11-29 09:35:51 +01:00
e4082ee5d9
Merge branch '2.5.x'
...
Closes gh-28834
2021-11-28 11:18:57 +01:00
1d786e49e9
Fix typos in the "External Application Properties" section
...
See gh-28830
2021-11-28 11:17:22 +01:00
9719930496
Merge branch '2.5.x'
...
Closes gh-28833
2021-11-28 11:14:52 +01:00
dce979d51f
Fix output of "spring --version" in reference documentation
...
See gh-28831
2021-11-28 11:14:14 +01:00
4bd86a6e20
Allow spring-boot-image-tests to run without an existing snapshot
...
Closes gh-28817
2021-11-26 13:01:34 +00:00
1c1c85c3f8
Fix MariaDB mapping for Quartz DataSource initialization
...
See gh-28779
2021-11-25 09:38:44 +01:00
27eb992252
Fix property source ordering in SpringBootTest
...
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.
Closes gh-28804
2021-11-24 10:29:35 -08:00
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
e7ff2cf358
Guard ErrorPageSecurityFilter configuration with ConditionalOnClass
...
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.
Fixes gh-28774
2021-11-24 10:20:29 -08:00
49e408828c
Fix property source ordering in SpringBootTest
...
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.
Fixes gh-28776
2021-11-24 10:17:02 -08:00
e6b5be900a
Make ErrorPageSecurityFilter Servlet 3.1 compatible
...
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.
Fixes gh-28790
2021-11-24 09:59:27 -08:00
f621937d3b
Skip error page security filter for non-error dispatch type
...
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.
Fixes gh-28759
2021-11-24 09:55:59 -08:00
4eed637481
Merge branch '2.5.x'
...
Closes gh-28789
2021-11-23 12:45:46 -06:00
12244a8edd
Remove use of Thymeleaf from smoke tests
...
Closes gh-28788
2021-11-23 12:13:05 -06:00
03e283a2e6
Mention WebProperties in deprecation of ResourceProperties
...
Closes gh-28762
2021-11-22 10:03:21 +00:00
da2dfbe0aa
LettuceMetricsAutoConfiguration should not build ClientResources
...
See gh-28767
2021-11-22 09:49:07 +01:00
490ec8974d
Merge branch '2.5.x'
...
Closes gh-28761
2021-11-20 17:30:35 +01:00
667bca05ec
Polish "Add package info for Spring Data metrics support"
...
See gh-28756
2021-11-20 17:29:52 +01:00
42ae5114ef
Create package-info.java
...
Closes #28731
2021-11-20 17:29:22 +01:00
0074d621d0
Merge branch '2.5.x'
...
Closes gh-28754
2021-11-19 15:37:32 +00:00
015cf920da
Name custom task inputs
...
Closes gh-28753
2021-11-19 15:35:39 +00:00
258222781a
Merge branch '2.5.x'
...
Closes gh-28752
2021-11-19 14:52:03 +00:00
96d98a0f6f
Declare dir task inputs with relative path sensitivity
...
Closes gh-28751
2021-11-19 14:29:29 +00:00
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
4a0fa62d2e
Polish "Replace "you're""
...
See gh-28710
2021-11-19 13:24:17 +00:00
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
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
2021-11-19 10:19:14 +00:00
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
2021-11-19 10:13:14 +00:00
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
29725ec68a
Update links to Spring Security's reference docs
...
Closes gh-28618
2021-11-18 11:59:48 +00:00
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
2021-11-17 16:41:23 -08:00
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
7fbb9d471b
Polish "Upgrade to Neo4j Java Driver 4.2.8"
...
See gh-28717
2021-11-17 16:14:25 +01:00
a6163f6acf
Upgrade to Netty tcNative 2.0.46.Final
...
Closes gh-28720
2021-11-17 15:03:59 +01:00
fc69be302a
Upgrade to HttpClient5 5.1.2
...
Closes gh-28719
2021-11-17 15:03:57 +01:00
f33c8f6fde
Upgrade to Netty tcNative 2.0.46.Final
...
Closes gh-28718
2021-11-17 15:02:27 +01:00
9dd599c9e3
Upgrade to Neo4j Java Driver 4.2.8
...
Closes gh-28717
2021-11-17 15:02:25 +01:00
ba3d0d7771
Upgrade to Spring Session 2021.1.0
...
Closes gh-28522
2021-11-17 14:14:08 +01:00
ea0613c7d7
Merge branch '2.5.x'
...
Closes gh-28261
2021-11-17 10:07:18 +00:00
416a133fd1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28250
2021-11-17 10:06:41 +00:00
838533ef0e
Upgrade to Spring Batch 4.3.4
...
Closes gh-28230
2021-11-17 10:04:51 +00:00
afa006986b
Merge branch '2.5.x'
...
Closes gh-28713
2021-11-17 09:01:53 +01:00
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
d88658d47a
Remove dependencies on micrometer-jersey2
...
Closes gh-28706
2021-11-17 08:56:08 +01:00
37864f6e66
Upgrade to Spring Integration 5.5.6
...
Closes gh-28521
2021-11-17 08:51:20 +01:00
6325df2055
Upgrade to Spring Integration 5.5.6
...
Closes gh-28513
2021-11-17 08:50:32 +01:00
f1991d8d80
Avoid bean override with CachingMetadataReaderFactoryPostProcessor
...
Closes gh-28705
2021-11-16 16:24:32 +01:00
dbcd0524a5
Upgrade to Logback 1.2.7
...
Closes gh-28699
2021-11-16 11:02:02 +01:00
8356204430
Upgrade to Flyway 8.0.4
...
Closes gh-28697
2021-11-16 11:02:02 +01:00
4b64f36356
Upgrade to Spring Security 5.6.0
...
Closes gh-28520
2021-11-16 09:43:30 +01:00
4fcb772f37
Upgrade to Logback 1.2.7
...
Closes gh-28695
2021-11-16 09:08:15 +01:00
c4eea99608
Upgrade to Kafka 2.7.2
...
Closes gh-28694
2021-11-16 09:08:14 +01:00
44b644c770
Merge branch '2.5.x'
...
Closes gh-28693
2021-11-16 08:59:58 +01:00
9ed7674ab0
Polish "Fix yaml sample format"
...
See gh-28671
2021-11-16 08:55:52 +01:00
7f1bd43c84
Fix yaml sample format
...
See gh-28671
2021-11-16 08:53:42 +01:00
6d4537b5ae
Merge branch '2.5.x'
...
Closes gh-28692
2021-11-16 08:50:53 +01:00
6d79599d99
Polish "Fix yaml sample format in reference doc"
...
See gh-28670
2021-11-16 08:50:24 +01:00
793a107d27
Fix yaml sample format in reference doc
...
See gh-28670
2021-11-16 08:45:50 +01:00
cdc14250c4
Merge branch '2.5.x'
...
Closes gh-28691
2021-11-16 08:34:39 +01:00
e56efc03f6
Update URL for GraphQL Spring Boot starter
...
See gh-28683
2021-11-16 08:33:56 +01:00
52ecc1e0dd
Polish "Create EndpointWebExtension only if necessary"
...
See gh-28475
2021-11-16 08:22:35 +01:00
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
a4c5f07391
Upgrade to Spring Kafka 2.8.0
...
Closes gh-28519
2021-11-15 19:58:47 +01:00
d058af5be2
Upgrade to Spring AMQP 2.4.0
...
Closes gh-28518
2021-11-15 19:58:29 +01:00
882c58b1f1
Upgrade to Spring Kafka 2.7.9
...
Closes gh-28539
2021-11-15 19:57:41 +01:00
d3c5563e60
Upgrade to Spring AMQP 2.3.12
...
Closes gh-28600
2021-11-15 19:57:15 +01:00
8903c69b19
Avoid exposing time-related task metrics
...
Fixes gh-28535
2021-11-15 12:24:50 -06:00
d7f8931dd4
Make TaskExecution and TaskScheduling metrics unique
...
Fixes gh-28536
2021-11-15 12:23:25 -06:00
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
Stephane Nicoll
fml2
Xavier Bouclet
Andy Wilkinson
Željko Tomić
Madhura Bhave
Phillip Webb
Scott Frederick
Yanming Zhou
charissathomas
Jay Bryant
Vedran Pavic
Weix Sun
izeye
davidh44
Leo Li
Filip Hrisafov
Josh Cummings