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,471 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

625 Commits

Author SHA1 Message Date
Andy Wilkinson 132bf686f8 Merge branch '2.7.x' 2022-02-22 20:13:28 +00:00
Andy Wilkinson 2d9177dd9d Merge branch '2.6.x' into 2.7.x 
Closes gh-29955
 2022-02-22 20:11:47 +00:00
Andy Wilkinson 3614c8d1f8 Merge branch '2.5.x' into 2.6.x 
Closes gh-29954
 2022-02-22 20:08:31 +00:00
Andy Wilkinson 1e8d29f7aa Configure Kotlin compilation JVM target by convention 
Closes gh-29952
 2022-02-22 18:11:51 +00:00
Moritz Halbritter d42f675959 Merge branch '2.7.x' 2022-02-21 10:36:05 +01:00
Moritz Halbritter d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates 
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
 2022-02-21 10:34:38 +01:00
Moritz Halbritter 42808ff13c Merge branch '2.7.x' 
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
 2022-02-17 10:56:23 +01:00
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file 
Closes gh-29873
 2022-02-17 10:18:46 +01:00
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
Moritz Halbritter 7d68b58c8f Load auto-configurations from META-INF/spring-boot 
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
 2022-02-17 09:17:23 +01:00
Phillip Webb ff4b92a3ba Update copyright year of changed files 2022-02-16 20:44:54 -08:00
Stephane Nicoll 39e230b5d6 Merge branch '2.6.x' into 2.7.x 2022-02-16 16:51:37 +01:00
Stephane Nicoll 78797572ac Merge branch '2.5.x' into 2.6.x 2022-02-16 16:51:27 +01:00
Stephane Nicoll fa6a1463d0 Polish 2022-02-16 16:51:16 +01:00
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration 
Closes gh-29871
 2022-02-16 15:48:27 +01:00
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration 
Closes gh-29871
 2022-02-16 13:55:16 +01:00
Stephane Nicoll 587b278bb4 Merge branch '2.7.x' 2022-02-16 11:27:10 +01:00
Stephane Nicoll 719fb2e8e5 Upgrade to Jetty 9.4.45.v20220203 
Closes gh-29843
 2022-02-16 09:46:10 +01:00
Stephane Nicoll dc171c6462 Upgrade to Jetty 9.4.45.v20220203 
Closes gh-29791
 2022-02-14 13:43:43 +01:00
Stephane Nicoll a99582a3bb Upgrade to Jetty 9.4.45.v20220203 
Closes gh-29771
 2022-02-14 13:43:23 +01:00
Stephane Nicoll 3b4832445b Merge branch '2.7.x' 2022-02-05 14:02:00 +01:00
Stephane Nicoll 098a57affb Upgrade to R2DBC Borca-RELEASE 
See gh-28524
 2022-02-05 13:37:20 +01:00
Stephane Nicoll 8c8c9c5f28 Upgrade to H2 2.1.210 
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.

Closes gh-29651

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
 2022-02-05 13:36:53 +01:00
Stephane Nicoll b22e3d51dc Merge branch '2.7.x' 2022-02-04 10:10:29 +01:00
Henning Poettker e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility 
See gh-29200
 2022-02-04 09:57:59 +01:00
Phillip Webb a282f912e6 Organize imports 
Organize imports according to updated checkstyle rules.
 2022-02-02 19:16:13 -08:00
Stephane Nicoll 41fb9cf562 Merge branch '2.7.x' 2022-02-01 11:15:49 +01:00
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x 
Closes gh-29613
 2022-02-01 11:07:31 +01:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x 
Closes gh-29612
 2022-02-01 10:59:08 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito" 
See gh-29178
 2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito 
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
 2022-02-01 09:37:15 +01:00
Andy Wilkinson 35b5b5672d Merge branch '2.7.x' 2022-01-20 12:37:16 +00:00
Andy Wilkinson 2c049f2b40 Merge branch '2.6.x' into 2.7.x 
Closes gh-29501
 2022-01-20 12:36:49 +00:00
Madhura Bhave 3460c24a16 Ignore context path when calling privilege evaluator 
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.

This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.

Closes gh-29299

Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
 2022-01-20 12:36:18 +00:00
Andy Wilkinson 1fa541d4de Merge branch '2.7.x' 2022-01-19 17:24:42 +00:00
Andy Wilkinson fa9a4a6452 Merge branch '2.6.x' into 2.7.x 2022-01-19 17:24:29 +00:00
Andy Wilkinson 4c422b9f3c Merge branch '2.5.x' into 2.6.x 2022-01-19 17:24:17 +00:00
Andy Wilkinson b60612dabb Disable LoaderIntegrationTests when Docker's unavailable 
Closes gh-29385
 2022-01-19 17:23:30 +00:00
Phillip Webb 13f6729b37 Merge branch '2.7.x' 2022-01-18 18:49:08 -08:00
Phillip Webb e95c514fd5 Merge branch '2.6.x' into 2.7.x 2022-01-18 18:48:53 -08:00
Phillip Webb f6cdc27b2a Merge branch '2.5.x' into 2.6.x 2022-01-18 18:48:40 -08:00
Phillip Webb eca05c42fb Further refine LoaderIntegrationTests for CI 
Update `LoaderIntegrationTests` to filter compatible JDKs early.

See gh-29385
 2022-01-18 18:47:41 -08:00
Phillip Webb e18cbe5fe2 Merge branch '2.7.x' 2022-01-18 18:19:46 -08:00
Phillip Webb 8aacf4cb36 Merge branch '2.6.x' into 2.7.x 2022-01-18 18:19:07 -08:00
Phillip Webb 392de30390 Merge branch '2.5.x' into 2.6.x 2022-01-18 18:18:56 -08:00
Phillip Webb de8f8c3e64 Refine LoaderIntegrationTests for CI 
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.

See gh-29385
 2022-01-18 18:16:47 -08:00
Phillip Webb 2d1854a682 Merge branch '2.7.x' 2022-01-18 17:42:34 -08:00
Phillip Webb 1f77533b09 Merge branch '2.6.x' into 2.7.x 
Closes gh-29463
 2022-01-18 17:37:10 -08:00
Phillip Webb 44537d4494 Merge branch '2.5.x' into 2.6.x 
Closes gh-29462
 2022-01-18 17:36:59 -08:00
Phillip Webb 3d908079ef Run LoaderIntegrationTests against multiple JDKs 
Update `LoaderIntegrationTests` to run against OpenJDK 8, 11 and 17 as
well as Oracle JDK 17.

Closes gh-29385
 2022-01-18 17:36:48 -08:00