Commit Graph

31880 Commits

Author SHA1 Message Date
Stephane Nicoll 28d27f5fe7 Upgrade to Spring Kafka 2.7.0
Closes gh-25930
2021-04-15 08:48:09 +02:00
Stephane Nicoll 28665ee93b Upgrade to Spring Integration 5.5.0-RC1
Closes gh-25929
2021-04-15 08:47:41 +02:00
Phillip Webb 282a8e09d0 Merge branch '2.4.x'
Closes gh-26125
2021-04-14 17:43:12 -07:00
Phillip Webb 5b836f3aee Merge branch '2.3.x' into 2.4.x
Closes gh-26124
2021-04-14 17:42:38 -07:00
Phillip Webb 930c637b77 Merge pull request #25455 from nguyensach
* pr/25455:
  Polish 'Don't detect CloudPlatform when property is set'
  Don't detect CloudPlatform when property is set

Closes gh-25455
2021-04-14 17:41:03 -07:00
Phillip Webb 61ff3c98bf Polish 'Don't detect CloudPlatform when property is set'
See gh-25455
2021-04-14 17:29:30 -07:00
nguyensach 70f44d3a56 Don't detect CloudPlatform when property is set
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.

See gh-25455
2021-04-14 17:24:37 -07:00
Phillip Webb b4c9bb0d5c Merge branch '2.4.x'
Closes gh-26122
2021-04-14 15:05:55 -07:00
Phillip Webb fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb fcb2210a87 Include optional shade plugin in published pom
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
2021-04-14 15:02:42 -07:00
Scott Frederick bf8051cd47 Log ApplicationAvailability state changes
Fixes gh-23098
2021-04-14 13:54:59 -05:00
Andy Wilkinson 5f95766858 Merge branch '2.4.x' 2021-04-14 17:40:17 +01:00
Andy Wilkinson 1f0127036c Upgrade to Spring Integration 5.4.6
Closes gh-26113
2021-04-14 17:26:54 +01:00
Andy Wilkinson f98664ea63 Merge branch '2.4.x' 2021-04-14 17:26:06 +01:00
Andy Wilkinson bcbb1a4346 Merge branch '2.3.x' into 2.4.x 2021-04-14 17:25:53 +01:00
Andy Wilkinson e6130c6ce0 Upgrade to Spring Integration 5.3.7.RELEASE
Closes gh-26112
2021-04-14 17:24:22 +01:00
Andy Wilkinson 9d0e1a2cb3 Include SQL init auto-config in Data RDBC test slice
Closes gh-24741
2021-04-14 16:37:33 +01:00
Andy Wilkinson 05adf02a47 Include SQL init auto-config in JDBC-based test slices
Closes gh-25323
2021-04-14 15:11:28 +01:00
Stephane Nicoll e2252c7856 Merge branch '2.4.x'
Closes gh-26111
2021-04-14 15:44:10 +02:00
Stephane Nicoll 401ebc672b Merge branch '2.3.x' into 2.4.x
Closes gh-26110
2021-04-14 15:43:57 +02:00
Stephane Nicoll ab785d9417 Document limitations of using deferred JPA bootstrap
Closes gh-24027
2021-04-14 15:38:34 +02:00
Stephane Nicoll fe2e57dee8 Upgrade to Spring Data 2021.0.0
Closes gh-25928
2021-04-14 15:18:12 +02:00
Stephane Nicoll 8c15e693d3 Merge branch '2.4.x'
Closes gh-26109
2021-04-14 15:07:23 +02:00
Stephane Nicoll 0d81b4d07e Merge branch '2.3.x' into 2.4.x
Closes gh-26108
2021-04-14 15:04:28 +02:00
Stephane Nicoll 0fb482579b Harmonize Neo4jContainer startup options
Closes gh-26084
2021-04-14 14:50:04 +02:00
Stephane Nicoll c04d640452 Scan for ElasticSearch's @Document type
Closes gh-26028
2021-04-14 14:42:32 +02:00
Stephane Nicoll 517998a829 Upgrade to Infinispan 12.1.1.Final
Closes gh-26053
2021-04-14 13:47:57 +02:00
Stephane Nicoll c285ef9cc7 Merge branch '2.4.x' 2021-04-14 13:37:39 +02:00
Stephane Nicoll 0cedbf6e06 Upgrade to Spring Data 2020.0.8
Closes gh-25910
2021-04-14 13:37:24 +02:00
Stephane Nicoll ec0ade6322 Merge branch '2.3.x' into 2.4.x 2021-04-14 13:36:50 +02:00
Stephane Nicoll 1de2dd9ecb Upgrade to Spring Data Neumann-SR9
Closes gh-25905
2021-04-14 13:31:16 +02:00
Stephane Nicoll 62a70475c2 Fix class condition on deprecated class
Closes gh-26107
2021-04-14 13:30:20 +02:00
Stephane Nicoll c5214b3c84 Merge branch '2.4.x'
Closes gh-26105
2021-04-14 10:06:39 +02:00
Stephane Nicoll 6a1f6ad6bb Merge pull request #26085 from rehevkor5
* pr/26085:
  Polish "Document spring.config.additional-location should be used early"
  Document spring.config.additional-location should be used early

Closes gh-26085
2021-04-14 10:06:31 +02:00
Stephane Nicoll 1855f96d07 Polish "Document spring.config.additional-location should be used early"
See gh-26085
2021-04-14 10:06:06 +02:00
Shannon Carey b0b1c04fc4 Document spring.config.additional-location should be used early
See gh-26085
2021-04-14 10:03:56 +02:00
Stephane Nicoll 0837844ba9 Merge branch '2.4.x' 2021-04-14 09:08:12 +02:00
Stephane Nicoll 8b7c512974 Merge branch '2.3.x' into 2.4.x 2021-04-14 09:08:00 +02:00
Stephane Nicoll 90fccd7097 Upgrade to SAAJ Impl 1.5.3
Closes gh-26104
2021-04-14 08:47:27 +02:00
Stephane Nicoll 54d23bac9d Upgrade to Micrometer 1.6.6
Closes gh-26103
2021-04-14 08:47:26 +02:00
Stephane Nicoll 3a8736a112 Upgrade to Lettuce 6.0.4.RELEASE
Closes gh-26102
2021-04-14 08:47:25 +02:00
Stephane Nicoll 0429ab4b88 Upgrade to HSQLDB 2.5.2
Closes gh-26101
2021-04-14 08:47:24 +02:00
Stephane Nicoll 00b53b5bdb Upgrade to Glassfish JAXB 2.3.4
Closes gh-26100
2021-04-14 08:47:22 +02:00
Stephane Nicoll cb2a7dd4cb Upgrade to SAAJ Impl 1.5.3
Closes gh-26099
2021-04-14 08:28:19 +02:00
Stephane Nicoll cb1d7a3bc8 Upgrade to Micrometer 1.5.13
Closes gh-26098
2021-04-14 08:28:18 +02:00
Stephane Nicoll 7c85ebc9c9 Upgrade to Lettuce 5.3.7.RELEASE
Closes gh-26097
2021-04-14 08:28:16 +02:00
Stephane Nicoll 274cfc0af0 Upgrade to HSQLDB 2.5.2
Closes gh-26096
2021-04-14 08:28:14 +02:00
Stephane Nicoll 4a5cb3f29e Upgrade to Glassfish JAXB 2.3.4
Closes gh-26095
2021-04-14 08:28:13 +02:00
Stephane Nicoll caa21b0fbe Upgrade to Flatten Maven Plugin 1.2.7
Closes gh-26094
2021-04-14 08:28:12 +02:00
Stephane Nicoll f8768c053a Upgrade to Micrometer 1.7.0-RC1
Closes gh-25934
2021-04-14 08:17:09 +02:00