root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
36,478 Commits 23 Branches 348 Tags 291 MiB
Commit Graph

36478 Commits

Author SHA1 Message Date
Phillip Webb 123e22afb0 Upgrade to MongoDB 4.5.1 
Closes gh-30416
 2022-03-24 11:04:39 -07:00
Phillip Webb b89374a917 Merge branch '2.6.x' into 2.7.x 2022-03-24 11:02:25 -07:00
Phillip Webb acb63e7126 Merge branch '2.5.x' into 2.6.x 2022-03-24 11:01:05 -07:00
Spring Builds 7072e9e75b Next development version (v2.6.6-SNAPSHOT) 2022-03-24 14:23:11 +00:00
Moritz Halbritter 47bf218bd2 Add prohibit clauses to shut up bomr 2022-03-24 15:18:19 +01:00
Spring Builds fe27ce8c91 Next development version (v2.5.12-SNAPSHOT) 2022-03-24 12:45:53 +00:00
Andy Wilkinson 975674d319 Merge branch '2.6.x' into 2.7.x 
Closes gh-30410
 2022-03-24 11:00:19 +00:00
Andy Wilkinson 12d9c7b1c8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30409
 2022-03-24 10:59:50 +00:00
Andy Wilkinson 64138a138f Upgrade registry-image-resource in CI pipelines to 1.5.0 
Closes gh-30408
 2022-03-24 10:59:25 +00:00
Stephane Nicoll 89718c0f90 Merge branch '2.6.x' into 2.7.x 2022-03-24 08:48:59 +01:00
Stephane Nicoll 11a249fe2a Upgrade Java 18 version in CI image 
Closes gh-30404
 2022-03-24 08:48:46 +01:00
Stephane Nicoll faedb874c2 Upgrade Ubuntu version in CI images 
Closes gh-30403
 2022-03-24 08:48:04 +01:00
Stephane Nicoll 330afb0e5b Merge branch '2.5.x' into 2.6.x 2022-03-24 08:47:27 +01:00
Stephane Nicoll 2b7712a2f1 Upgrade Java 18 version in CI image 
Closes gh-30398
 2022-03-24 08:46:52 +01:00
Stephane Nicoll 02e16675f3 Upgrade Ubuntu version in CI images 
Closes gh-30397
 2022-03-24 08:45:22 +01:00
Stephane Nicoll 5deb8d7edc Upgrade Java 18 version in CI image 
Closes gh-30401
 2022-03-24 08:44:19 +01:00
Stephane Nicoll f8f7a24dde Upgrade Ubuntu version in CI images 
Closes gh-30400
 2022-03-24 08:43:42 +01:00
Andy Wilkinson 5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props 
Closes gh-30067
 2022-03-23 20:15:04 +00:00
Andy Wilkinson 06c3e2a041 Merge branch '2.6.x' into 2.7.x 
Closes gh-30394
 2022-03-23 15:30:43 +00:00
Andy Wilkinson 2317f69f4c Add Apache Kafka to Messaging section's description 
Closes gh-30389
 2022-03-23 15:29:56 +00:00
Andy Wilkinson b911530c31 Merge branch '2.6.x' into 2.7.x 
Closes gh-30393
 2022-03-23 15:29:09 +00:00
Andy Wilkinson 9c128f1acc Merge branch '2.5.x' into 2.6.x 
Closes gh-30392
 2022-03-23 15:28:56 +00:00
Andy Wilkinson 73d9e0e0ed Fix equals when adapt removes trailing characters from element 
Closes gh-30317
 2022-03-23 14:55:00 +00:00
Stephane Nicoll b70c409178 Upgrade to Selenium HtmlUnit 3.60.0 
Closes gh-30391
 2022-03-23 15:32:00 +01:00
Stephane Nicoll d7ca7763da Upgrade to HtmlUnit 2.60.0 
Closes gh-30390
 2022-03-23 15:31:57 +01:00
Moritz Halbritter 3e26c584fd Merge branch '2.6.x' into 2.7.x 2022-03-23 13:46:49 +01:00
Moritz Halbritter 27ddcbd551 Merge branch '2.5.x' into 2.6.x 2022-03-23 13:46:33 +01:00
Moritz Halbritter cd5d3dbf8d Disable SampleSessionWebFluxApplicationTests on Linux aarch64 
These tests use embedded mongo under the hood.

See gh-30082
 2022-03-23 13:45:25 +01:00
Andy Wilkinson 3255da23a2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30388
 2022-03-23 12:11:13 +00:00
Andy Wilkinson c739831087 Merge branch '2.5.x' into 2.6.x 
Closes gh-30387
 2022-03-23 12:11:02 +00:00
Andy Wilkinson d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types 
Closes gh-30280
 2022-03-23 12:09:48 +00:00
Andy Wilkinson 3ee44ca0b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30386
 2022-03-23 11:47:53 +00:00
Andy Wilkinson f378627f94 Merge branch '2.5.x' into 2.6.x 
Closes gh-30385
 2022-03-23 11:45:31 +00:00
Andy Wilkinson 8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config 
Closes gh-30384
 2022-03-23 11:44:59 +00:00
Andy Wilkinson bcb71dfd1b Merge branch '2.6.x' into 2.7.x 
Closes gh-30383
 2022-03-23 11:18:04 +00:00
Andy Wilkinson 1244c429a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30382
 2022-03-23 11:17:36 +00:00
Andy Wilkinson e927cd71dd Clarify type matching performed by MockBean and SpyBean 
Closes gh-28656
 2022-03-23 11:17:07 +00:00
Moritz Halbritter 1fec2f0e9b Merge branch '2.6.x' into 2.7.x 2022-03-23 12:06:57 +01:00
Moritz Halbritter 4e09289076 Merge branch '2.5.x' into 2.6.x 
# Conflicts:
#	spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
 2022-03-23 12:04:30 +01:00
Moritz Halbritter 1d15e8c8e2 Disable SampleMongoApplicationTests on Linux aarch64 
See gh-30082
 2022-03-23 12:03:35 +01:00
Andy Wilkinson 47540eec61 Align default indices options with Spring Data Elasticsearch 
Closes gh-30378
 2022-03-23 09:39:05 +00:00
Andy Wilkinson ac3b0ea24a Merge branch '2.6.x' into 2.7.x 
Closes gh-30380
 2022-03-23 09:36:31 +00:00
Andy Wilkinson 24aa4070c9 Merge pull request #30349 from hpoettker 
* gh-30349:
  Fix links to Spring Security Reference Guide

Closes gh-30349
 2022-03-23 09:35:58 +00:00
Henning Poettker 22eb301bcf Fix links to Spring Security Reference Guide 
See gh-30349
 2022-03-23 09:35:30 +00:00
Stephane Nicoll c46953ae06 Merge branch '2.6.x' into 2.7.x 2022-03-23 08:07:31 +01:00
Stephane Nicoll dc7c1f246f Upgrade to Spring Integration 5.5.10 
Closes gh-30193
 2022-03-23 08:07:11 +01:00
Stephane Nicoll 5011a12f71 Merge branch '2.5.x' into 2.6.x 2022-03-23 08:06:34 +01:00
Stephane Nicoll 589804000b Upgrade to Spring Integration 5.5.10 
Closes gh-30183
 2022-03-23 08:06:25 +01:00
Stephane Nicoll acdfa31f5a Upgrade to Spring Integration 5.5.10 
Closes gh-30175
 2022-03-23 08:05:45 +01:00
Andy Wilkinson 79ee53a587 Merge branch '2.6.x' into 2.7.x 
Closes gh-30377
 2022-03-22 20:13:04 +00:00