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
31,627 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

31627 Commits

Author SHA1 Message Date
Phillip Webb d938dd97bf Add with/without methods to ConfigData.Options 
Add convenience methods to ConfigData.Options to allow new Options
instances to be created with options excluded or included.

See gh-25766
 2021-04-08 13:21:14 -07:00
Scott Frederick 86303c017b Merge branch '2.4.x' 
Closes gh-25938
 2021-04-08 13:03:45 -05:00
Scott Frederick 9108b81bb2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25937
 2021-04-08 13:03:26 -05:00
Scott Frederick 0ad7f76263 Preserve file permissions in images built by Gradle 
This commit copies the file mode along with other attributes when
copying files from the source archive to the build container while
building an image using the Gradle plugin. This preserves file
permissions on any resources included in the source archive.

Fixes gh-25915
 2021-04-08 12:56:41 -05:00
Stephane Nicoll 5ca4cc9c56 Merge branch '2.4.x' 2021-04-08 18:42:17 +02:00
Brian Clozel 0929048bb4 Link build tools docs version properties section 
Closes gh-25935
 2021-04-08 18:18:11 +02:00
Stephane Nicoll 5aa1e683c0 Start building against Spring Session 2020.0.4 snapshots 
See gh-25912
 2021-04-08 18:02:04 +02:00
Stephane Nicoll 0f53663cf6 Start building against Spring Security 5.4.6 snapshots 
See gh-25911
 2021-04-08 18:02:03 +02:00
Stephane Nicoll aa8f5433ee Start building against Spring Data 2020.0.8 snapshots 
See gh-25910
 2021-04-08 18:02:03 +02:00
Stephane Nicoll f1b2db03e0 Start building against Spring Framework 5.3.6 snapshots 
See gh-25909
 2021-04-08 18:02:03 +02:00
Brian Clozel b4d2207902 Merge branch '2.4.x' 
Closes gh-25936
 2021-04-08 17:45:42 +02:00
Brian Clozel a0ee0601ef Fix SSL configuration with Reactor Netty 
Prior to this commit, the SslServerCustomizer would use a Reactor Netty
API that lets users customize the SSL configuration, but later override
some of the choices with defaults.

This commits moves from the new deprecated Reactor Netty API and instead
uses a new variant that builds the defaults and lets developers override
them if they want to.

Fixes gh-25913
 2021-04-08 17:09:31 +02:00
Stephane Nicoll b52902e92a Merge branch '2.4.x' 
Closes gh-25923
 2021-04-08 10:14:03 +02:00
Stephane Nicoll c6205f10f1 Merge branch '2.3.x' into 2.4.x 
Closes gh-25922
 2021-04-08 10:13:45 +02:00
Stephane Nicoll 1d61da1786 Merge pull request #25884 from alex-bel-apica 
* pr/25884:
  Polish "Properly close input streams when loading key stores"
  Properly close input streams when loading key stores

Closes gh-25884
 2021-04-08 10:12:38 +02:00
Stephane Nicoll 25b7495d8e Polish "Properly close input streams when loading key stores" 
See gh-25884
 2021-04-08 09:25:03 +02:00
Alex Belyaev 1e3f5c342b Properly close input streams when loading key stores 
See gh-25884
 2021-04-08 09:21:58 +02:00
Stephane Nicoll 152ce5f780 Upgrade Ubuntu version in CI images 
Closes gh-25917
 2021-04-08 08:22:13 +02:00
Stephane Nicoll 5e2a611742 Merge branch '2.4.x' 2021-04-08 08:21:04 +02:00
Stephane Nicoll 4d52fe6db4 Upgrade Ubuntu version in CI images 
Closes gh-25918
 2021-04-08 08:20:52 +02:00
Stephane Nicoll 8565728a89 Merge branch '2.3.x' into 2.4.x 2021-04-08 08:19:44 +02:00
Stephane Nicoll 2ac160a9b8 Upgrade Ubuntu version in CI images 
Closes gh-25916
 2021-04-08 08:19:05 +02:00
Stephane Nicoll aae524766f Merge branch '2.4.x' 2021-04-08 08:05:54 +02:00
Stephane Nicoll f5009cb0a8 Merge branch '2.3.x' into 2.4.x 2021-04-08 08:05:35 +02:00
Phillip Webb e4164d0143 Fix package tangle in endpoint package 
Fix package tangle in the actuator endpoint package by relocating a
few classes.

The `Producible` and `ProducibleOperationArgumentResolver` classes have
been moved from `endpoint.annotation` to `endpoint` since they aren't
directly tied to annotations.

The `ApiVersion` class has been moved from `endpoint.http` to
`endpoint` since it needs to implement `Producible` and isn't really
tied to HTTP.

Closes gh-25914
 2021-04-07 16:54:37 -07:00
Phillip Webb e766c8b3a7 Revert "Switch default MVC path matching strategy" 
This reverts commit ab8e599cfe.

See gh-24805
 2021-04-07 15:17:02 -07:00
Phillip Webb ab8e599cfe Switch default MVC path matching strategy 
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
 2021-04-07 11:02:45 -07:00
Phillip Webb 455864bfa0 Allow 'servet.path' with path pattern parser 
Remove the restriction previously prevented `spring.mvc.servlet.path`
from being combined with a `spring.mvc.pathmatch.matching-strategy`
of `PATH_PATTERN_PARSER`. Spring Framework supports this combination
as of v5.3.4.

See gh-24805
 2021-04-07 10:59:55 -07:00
Stephane Nicoll 2a60503849 Start building against Spring Session Dragonfruit-SR3 snapshots 
See gh-25907
 2021-04-07 15:43:12 +02:00
Stephane Nicoll e4bf730f0b Start building against Spring Security 5.3.9 snapshots 
See gh-25906
 2021-04-07 15:42:42 +02:00
Stephane Nicoll b12a725977 Start building against Spring Data Neumann-SR9 snapshots 
See gh-25905
 2021-04-07 15:42:07 +02:00
Stephane Nicoll 80e893ebae Upgrade to Spring HATEOAS 1.1.5 
Closes gh-25904
 2021-04-07 15:41:34 +02:00
Stephane Nicoll aab5859fde Start building against Spring Framework 5.2.14 snapshots 
See gh-25903
 2021-04-07 15:41:17 +02:00
Stephane Nicoll ac1117f1a1 Start building against Reactor Reactor Dysprosium-SR19 
See gh-25902
 2021-04-07 15:40:40 +02:00
Andy Wilkinson 4d510d3c9b Merge pull request #25829 from jdubois 
* gh-25829:
  Polish "Add detection of Azure App Service to CloudPlatform"
  Add detection of Azure App Service to CloudPlatform

Closes gh-25829
 2021-04-07 13:45:52 +01:00
Andy Wilkinson 4d31182123 Polish "Add detection of Azure App Service to CloudPlatform" 
See gh-25829
 2021-04-07 12:34:54 +01:00
Julien Dubois 98a1017ee7 Add detection of Azure App Service to CloudPlatform 
See gh-25829
 2021-04-07 12:34:49 +01:00
Andy Wilkinson 660dc5fcd7 Merge branch '2.4.x' 
Closes gh-25900
 2021-04-07 12:24:33 +01:00
Andy Wilkinson 8cd08c3926 Merge branch '2.3.x' into 2.4.x 
Closes gh-25899
 2021-04-07 12:24:07 +01:00
Andy Wilkinson 7c8caf9ef5 Configure Kotlin compilation to use 1.3 apiVersion and languageVersion 
Closes gh-25793
 2021-04-07 11:43:39 +01:00
Andy Wilkinson 8b5f914ba5 Revert "Merge branch '2.4.x'" 
This reverts commit 97b26b4886, reversing
changes made to 6f9b1ed6a3.

See gh-25840
 2021-04-07 10:20:23 +01:00
Andy Wilkinson 58a9fb4027 Merge branch '2.4.x' 2021-04-07 10:20:05 +01:00
Andy Wilkinson e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x" 
This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
 2021-04-07 10:19:20 +01:00
Andy Wilkinson 8048e59fa9 Merge branch '2.3.x' into 2.4.x 2021-04-07 10:18:34 +01:00
Andy Wilkinson b35d1ec6e8 Revert "Use test harness for image building integration tests" 
This reverts commit da9d8d6055.

See gh-25838
 2021-04-07 09:30:51 +01:00
Phillip Webb a24199bbcc Merge branch '2.4.x' 2021-04-06 23:08:05 -07:00
Phillip Webb 2971bdd9e3 Merge branch '2.3.x' into 2.4.x 2021-04-06 23:07:53 -07:00
Phillip Webb 51d57e19d0 Attempt to overcome Docker rate limiting on CI 
Update the common build script to pull buildpack images early using the
authenticated CLI.

See gh-25838
 2021-04-06 23:04:28 -07:00
Phillip Webb 72ccab0aad Fix WebSessionManager auto-configuration order 
Auto-configure `SessionAutoConfiguration` before
`WebFluxAutoConfiguration` to ensure that the correct
`WebSessionManager` bean is created.

See gh-20970
 2021-04-06 22:43:42 -07:00
Phillip Webb 807ea1af0d Update copyright year of changed files 2021-04-06 14:59:52 -07:00