root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
23,088 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

1698 Commits

Author SHA1 Message Date
Andy Wilkinson 6daab5c8ef Merge branch '2.1.x' 
Closes gh-18108
 2019-09-03 13:33:12 +01:00
Johnny Lim 2eac53cc5d Fix typo in deprecation reason for liquibase.check-change-log-location 
See gh-18100
 2019-09-03 13:32:29 +01:00
Andy Wilkinson ee0f57bfc7 Merge branch '2.1.x' 
Closes gh-18106
 2019-09-03 12:57:37 +01:00
Andy Wilkinson 52311ffe3c Depend on FlywayMigrationInitializer beans by type not name 
Previously, a custom FlywayMigrationInitializer bean named anything
other than flywayInitializer could result in a
NoSucBeanDefinitionException as the dependencies set up for JPA and
JDBC components used the bean name flywayInitializer.

This commit updates the configuration of the dependencies to depend
on FlywayMigrationInitializer beans by type rather than name.

Fixes gh-18105
 2019-09-03 12:45:17 +01:00
Andy Wilkinson 2dea534a0e Merge branch '2.1.x' 
Closes gh-18103
 2019-09-03 12:25:32 +01:00
Andy Wilkinson f313bf27a1 Depend on Flyway beans by type not name 
Previously, a custom Flyway bean named anything other than flyway
could result in a NoSucBeanDefinitionException as the dependencies
set up for JPA and JDBC components used the bean name flyway.

This commit updates the configuration of the dependencies to depend
on Flyway beans by name rather than type.

Fixes gh-18102
 2019-09-03 12:13:28 +01:00
dreis2211 07b857e57a Use disabledWithoutDocker option for @Testcontainers 
See gh-18095
 2019-09-03 09:51:53 +02:00
dreis2211 b4350a9d96 Remove unnecessary blank lines 
See gh-18089
 2019-09-03 08:48:10 +02:00
Andy Wilkinson 20b6656ba7 Protect autoconfigure module against slow starting test containers 2019-09-02 12:19:09 +01:00
Andy Wilkinson 3a417eec52 Merge branch '2.1.x' 2019-09-02 11:46:42 +01:00
Andy Wilkinson 4fd7b68f71 Polish 2019-09-02 11:45:55 +01:00
Phillip Webb a86258e62c Revert "Reduce bean method visibility" 
Reverts commit 2be3027dcf
on 2.1.x
 2019-09-01 20:04:09 -07:00
Phillip Webb b3835a8149 Merge branch '2.1.x' 2019-09-01 18:31:27 -07:00
Phillip Webb 2be3027dcf Reduce bean method visibility 
See gh-17539
 2019-09-01 18:30:39 -07:00
Phillip Webb 3746631081 Merge branch '2.1.x' 
Closes gh-18085
 2019-09-01 14:54:02 -07:00
Phillip Webb 75a1a24914 Polish "Ensure Flyway/Liquibase runs before Quartz" 
See gh-17539
 2019-09-01 14:48:37 -07:00
Dmytro Nosan 7e5bd1f281 Ensure Flyway/Liquibase runs before Quartz 
Add post processors to ensure that SchedulerFactoryBean and Scheduler
beans depend on the Flyway and Liquibase beans.

See gh-17539
 2019-09-01 14:46:25 -07:00
dreis2211 3e35a6616c Fix duplicated words 
See gh-18004
 2019-09-01 09:09:38 +02:00
Phillip Webb 1283bc05d7 Merge branch '2.1.x' 
Closes gh-18021
 2019-08-30 14:41:36 -07:00
Phillip Webb 5938ca78b6 Fix request matcher management context support 
Fix caching issues in `ApplicationContextRequestMatcher` and allow
subclasses to ignore an application context entirely. Update existing
matcher implementations so that they deal with the management context
correctly.

Prior to this commit, the `ApplicationContextRequestMatcher` would
return a context cached from the first request. It also didn't
provide any way to ignore a context. This meant that if the user was
running the management server on a different port the matching results
could be inconsistent depending on if the first request arrived on
the regular context or the management context. It also meant that we
could not distinguish between the regular context and the management
context when matching.

Closes gh-18012
 2019-08-30 14:36:16 -07:00
davinkevin 84c81462b4 Upgrade to jOOQ 3.12.0 
See gh-18014
 2019-08-30 09:56:02 +01:00
Andy Wilkinson e2edb6a539 Polish "Auto-configure Flyway with JavaMigration beans" 
See gh-17993
 2019-08-30 09:26:56 +01:00
Semyon Danilov ff68295928 Auto-configure Flyway with JavaMigration beans 
See gh-17993
 2019-08-30 09:20:59 +01:00
Andy Wilkinson 0e2a131e5d Polish "Upgrade to Flyway 6.0.1" 
See gh-17997
 2019-08-30 08:19:07 +01:00
Semyon Danilov 278b20d9c9 Upgrade to Flyway 6.0.1 
See gh-17997
 2019-08-30 08:19:07 +01:00
Stephane Nicoll 96596f8ecc Polish contribution 
See gh-17962
 2019-08-28 10:55:32 +02:00
Kant 7ee3656188 Polish 
See gh-17962
 2019-08-28 10:55:13 +02:00
Madhura Bhave 2726540e76 Merge branch '2.1.x' 
Closes gh-17980
 2019-08-28 13:13:48 +05:30
Madhura Bhave 674f2f5a6c EndpointRequest should match @ServletEndpoint 
This commit also changes the request matcher for MVC
endpoints to use an AntPathRequestMatcher instead of an
MvcRequestMatcher. The endpoint is always available
under the mapped endpoint path and this way the same matcher
can be used for both MVC and Jersey.

Fixes gh-17912

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
 2019-08-28 11:48:53 +05:30
dreis2211 ec57f0c31f Fix upstream RSocket method renames 
See gh-17973
 2019-08-27 13:12:52 +01:00
Madhura Bhave 46ea4a2501 isPublisherConfirms in RabbitProperties should not throw NPE 
Fixes gh-17967
 2019-08-27 08:39:55 +05:30
Stephane Nicoll 7d994e607d Restructure tests to exercise deprecated property in a dedicated test 
See gh-17848
 2019-08-24 08:22:28 +02:00
Madhura Bhave 21783faede Merge branch '2.1.x' 
Closes gh-17953
 2019-08-23 19:44:16 -07:00
Madhura Bhave 28d374d84d Polish "Configure Issuer Validator for Resource Server" 
See gh-17952
 2019-08-23 19:34:49 -07:00
HaiTao Zhang b3d189cf87 Configure Issuer Validator for Resource Server 
See gh-17952
 2019-08-23 19:34:31 -07:00
Madhura Bhave 8954fe13e5 Polish "Support additional publisher confirm types" 
See gh-17848
 2019-08-23 18:44:42 -07:00
HaiTao Zhang 8c1c8a27d9 Support additional publisher confirm types 
See gh-17848
 2019-08-23 18:44:15 -07:00
LiangYong 12bfca56d6 Remove unnecessary null check 
See gh-17916
 2019-08-23 13:25:11 +02:00
Andy Wilkinson c48228f645 Merge branch '2.1.x' 
Closes gh-17942
 2019-08-23 11:03:43 +01:00
Andy Wilkinson ac0a22d603 Tolerate LCEMFB with null JpaVendorAdapter in JPA auto-config 
Closes gh-17935
 2019-08-23 10:39:40 +01:00
Andy Wilkinson 05e089601e Remove default favicon and support for serving from classpath root 
Closes gh-17925
 2019-08-22 13:53:13 +01:00
dreis2211 6ef6875a60 Correct WebFlux response body method 
See gh-17919
 2019-08-21 11:07:48 +01:00
Andy Wilkinson 9ac6485768 Prioritise static resource locations over classpath for favicon.ico 
Closes gh-17922
 2019-08-21 10:42:32 +01:00
Brian Clozel e7c3ab3e27 Rename WebFlux response body methods 
This commit adapts to recent changes in Spring Framework.
See spring-projects/spring-framework#23212
 2019-08-20 13:03:24 +02:00
Andy Wilkinson 7f8944d00f Polish 2019-08-19 17:31:56 +01:00
Andy Wilkinson cc3df98135 Merge branch '2.1.x' 2019-08-19 16:08:25 +01:00
Andy Wilkinson ab87b2a39b Polish 2019-08-19 16:05:43 +01:00
LiangYong a5746d0a03 Simplify some code 
See gh-17893
 2019-08-19 07:24:54 +02:00
dreis2211 d4affd7f85 Use hasSize() assertion in favor of length checks 
See gh-17874
 2019-08-17 06:39:41 +02:00
Stephane Nicoll 04b63cda8f Merge branch '2.1.x' 
Closes gh-17889
 2019-08-17 06:38:00 +02:00