Commit Graph

35278 Commits (a0d4651a04744a863fc62d59bff91ff4bde07e98)
 

Author SHA1 Message Date
Stephane Nicoll afa006986b Merge branch '2.5.x'
Closes gh-28713
3 years ago
Stephane Nicoll 663d5d4362 Merge pull request #28712 from vpavic
* pr/28712:
  Fix "Configure Two DataSources" example

Closes gh-28712
3 years ago
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
3 years ago
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
3 years ago
Stephane Nicoll a02be1b9a2 Merge branch '2.5.x' 3 years ago
Stephane Nicoll 37864f6e66 Upgrade to Spring Integration 5.5.6
Closes gh-28521
3 years ago
Stephane Nicoll de172a52e3 Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6
Closes gh-28513
3 years ago
Stephane Nicoll 385e7dd612 Upgrade to Spring Integration 5.4.12
Closes gh-28612
3 years ago
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor
Closes gh-28705
3 years ago
Stephane Nicoll 08e9725b76 Upgrade to Tomcat 9.0.55
Closes gh-28700
3 years ago
Stephane Nicoll dbcd0524a5 Upgrade to Logback 1.2.7
Closes gh-28699
3 years ago
Stephane Nicoll d9bef3c21e Upgrade to Kotlin 1.6.0
Closes gh-28698
3 years ago
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4
Closes gh-28697
3 years ago
Stephane Nicoll 4b64f36356 Upgrade to Spring Security 5.6.0
Closes gh-28520
3 years ago
Stephane Nicoll 619905a9b9 Merge branch '2.5.x' 3 years ago
Stephane Nicoll d3e9e9519c Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll b16b0c789f Upgrade to Tomcat 9.0.55
Closes gh-28696
3 years ago
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7
Closes gh-28695
3 years ago
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2
Closes gh-28694
3 years ago
Stephane Nicoll 44b644c770 Merge branch '2.5.x'
Closes gh-28693
3 years ago
Stephane Nicoll 48ebd1bb4d Merge pull request #28671 from weixsun
* pr/28671:
  Polish "Fix yaml sample format"
  Fix yaml sample format

Closes gh-28671
3 years ago
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
3 years ago
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
3 years ago
Stephane Nicoll 6d4537b5ae Merge branch '2.5.x'
Closes gh-28692
3 years ago
Stephane Nicoll ea064ce036 Merge pull request #28670 from weixsun
* pr/28670:
  Polish "Fix yaml sample format in reference doc"
  Fix yaml sample format in reference doc

Closes gh-28670
3 years ago
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
3 years ago
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
3 years ago
Stephane Nicoll cdc14250c4 Merge branch '2.5.x'
Closes gh-28691
3 years ago
Stephane Nicoll 7f4c8aafdf Merge pull request #28683 from izeye
* pr/28683:
  Update URL for GraphQL Spring Boot starter

Closes gh-28683
3 years ago
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter
See gh-28683
3 years ago
Stephane Nicoll 62d87f95d3 Merge pull request #28475 from davidh44
* pr/28475:
  Polish "Create EndpointWebExtension only if necessary"
  Create EndpointWebExtension only if necessary

Closes gh-28475
3 years ago
Stephane Nicoll 52ecc1e0dd Polish "Create EndpointWebExtension only if necessary"
See gh-28475
3 years ago
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
3 years ago
Stephane Nicoll db3a7db73d Upgrade to Tomcat 9.0.55
Closes gh-28690
3 years ago
Stephane Nicoll 38fd96e9c1 Upgrade to Logback 1.2.7
Closes gh-28689
3 years ago
Stephane Nicoll 826515a20f Upgrade to Kafka 2.6.3
Closes gh-28688
3 years ago
Stephane Nicoll aaad7727f0 Merge branch '2.5.x' 3 years ago
Stephane Nicoll a4c5f07391 Upgrade to Spring Kafka 2.8.0
Closes gh-28519
3 years ago
Stephane Nicoll d058af5be2 Upgrade to Spring AMQP 2.4.0
Closes gh-28518
3 years ago
Stephane Nicoll 84d92b9504 Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9
Closes gh-28539
3 years ago
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12
Closes gh-28600
3 years ago
Stephane Nicoll a23b737443 Upgrade to Spring Kafka 2.6.12
Closes gh-28685
3 years ago
Stephane Nicoll 69da7b4188 Upgrade to Spring AMQP 2.3.12
Closes gh-28599
3 years ago
Scott Frederick 8903c69b19 Avoid exposing time-related task metrics
Fixes gh-28535
3 years ago
Scott Frederick d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique
Fixes gh-28536
3 years ago
Andy Wilkinson a1e7375fc0 Polish 3 years ago
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
3 years ago
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3
Closes gh-28679
3 years ago