Stephane Nicoll
641df02bc3
Merge pull request #26134 from izeye
...
* pr/26134:
Add RepositoryMetricsAutoConfiguration to spring.factories
Closes gh-26134
2021-04-15 16:28:06 +02:00
izeye
fb5a1270e8
Add RepositoryMetricsAutoConfiguration to spring.factories
...
See gh-26134
2021-04-15 16:27:49 +02:00
Stephane Nicoll
843a796116
Merge branch '2.4.x'
2021-04-15 15:07:02 +02:00
Spring Buildmaster
270bf0f937
Next development version (v2.4.6-SNAPSHOT)
2021-04-15 11:48:25 +00:00
Andy Wilkinson
3810b4c361
Merge branch '2.4.x'
2021-04-15 11:48:37 +01:00
Andy Wilkinson
c48a48f0a2
Merge branch '2.3.x' into 2.4.x
2021-04-15 11:48:12 +01:00
Spring Buildmaster
dea62c1734
Next development version (v2.3.11.BUILD-SNAPSHOT)
2021-04-15 09:52:11 +00:00
Andy Wilkinson
01fb599f6e
Revert "Attempt to overcome Docker rate limiting on CI"
...
This reverts commit 51d57e19d0
.
See gh-25838
2021-04-15 10:13:50 +01:00
Andy Wilkinson
bfe8e5ac19
Revert changes to make staging run Docker
...
See gh-26130
2021-04-15 10:11:43 +01:00
Stephane Nicoll
39a97f7b2d
Merge pull request #26129 from dreis2211
...
* pr/26129:
Avoid some redirects in docs
Closes gh-26129
2021-04-15 10:39:33 +02:00
dreis2211
beb7f7b02d
Avoid some redirects in docs
...
See gh-26129
2021-04-15 10:39:07 +02:00
Andy Wilkinson
6073cf7063
Marking staging tasks as privileged so they can start Docker
...
See gh-26130
2021-04-15 09:30:14 +01:00
Andy Wilkinson
f74123038a
Start Docker before running a staging build
...
Closes gh-26130
2021-04-15 09:09:15 +01:00
Stephane Nicoll
a27f6d9f9b
Merge branch '2.4.x'
2021-04-15 09:05:40 +02:00
Stephane Nicoll
f814beacec
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:05:10 +02:00
Stephane Nicoll
1de185caa4
Merge branch '2.3.x' into 2.4.x
2021-04-15 09:04:48 +02:00
Stephane Nicoll
e8eb68a458
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:01:55 +02:00
Stephane Nicoll
f558ceda9a
Upgrade to Spring WS 3.1.0-RC1
...
Closes gh-25933
2021-04-15 08:49:08 +02:00
Stephane Nicoll
0146ced614
Upgrade to Spring Session 2021.0.0-RC1
...
Closes gh-25932
2021-04-15 08:48:41 +02:00
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