Commit Graph

23171 Commits

Author SHA1 Message Date
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
Stephane Nicoll 54126f6904 Merge pull request #18095 from dreis2211
* pr/18095:
  Use disabledWithoutDocker option for @Testcontainers
  Upgrade to Testcontainers 1.12.0

Closes gh-18095
2019-09-03 09:52:18 +02:00
dreis2211 07b857e57a Use disabledWithoutDocker option for @Testcontainers
See gh-18095
2019-09-03 09:51:53 +02:00
dreis2211 594e2084c7 Upgrade to Testcontainers 1.12.0
See gh-18095
2019-09-03 09:51:47 +02:00
Stephane Nicoll 5dc133ae9e Merge branch '2.1.x'
Closes gh-18098
2019-09-03 08:51:25 +02:00
Stephane Nicoll ae863434b6 Merge pull request #18092 from dreis2211
* pr/18092:
  Remove duplicated dependency in spring-boot-docs

Closes gh-18092
2019-09-03 08:51:10 +02:00
dreis2211 087795fb67 Remove duplicated dependency in spring-boot-docs
See gh-18092
2019-09-03 08:50:27 +02:00
Stephane Nicoll b90d3a87d8 Merge pull request #18089 from dreis2211
* pr/18089:
  Remove unnecessary blank lines

Closes gh-18089
2019-09-03 08:49:24 +02:00
dreis2211 b4350a9d96 Remove unnecessary blank lines
See gh-18089
2019-09-03 08:48:10 +02:00
Andy Wilkinson 9ed6b92ecc Merge branch '2.1.x' 2019-09-02 17:22:09 +01:00
Andy Wilkinson b8070a8339 Skip tests on Windows that exceed its file system's limitations 2019-09-02 17:18:20 +01:00
Andy Wilkinson a4b8d2401f Merge branch '2.1.x'
Closes gh-18094
2019-09-02 14:54:48 +01:00
Andy Wilkinson abba4fa9c9 Include exception's message in message printed by AP
Fixes gh-17974
2019-09-02 14:52:14 +01:00
Andy Wilkinson b463acb10f Merge branch '2.1.x'
Closes gh-18093
2019-09-02 14:42:21 +01:00
Andy Wilkinson edcaee375f Consider @Deprecated on field when determining property's deprecation
Fixes gh-17550
2019-09-02 14:39:24 +01: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 dfa3322620 Merge branch '2.1.x' 2019-09-01 20:05:29 -07: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 0cfcbcba8f Merge pull request #17539 from nosan
* pr/17539:
  Polish "Ensure Flyway/Liquibase runs before Quartz"
  Ensure Flyway/Liquibase runs before Quartz

Closes gh-17539
2019-09-01 14:49:32 -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
Andy Wilkinson caa4c165b5 Merge branch '2.1.x'
Closes gh-18084
2019-09-01 20:21:18 +01:00
Andy Wilkinson 7150f121a3 Redirect stdout from cd to /dev/null in CLI's bash script
Fixes gh-17579
2019-09-01 20:20:32 +01:00
Andy Wilkinson 6017f2f529 Merge branch '2.1.x'
Closes gh-18083
2019-09-01 20:10:57 +01:00
Andy Wilkinson ee89e0effd Fix client auth with Jetty
Fixes gh-17541
2019-09-01 19:49:03 +01:00
Stephane Nicoll ad9e82190c Merge pull request #18004 from dreis2211
* pr/18004:
  Fix duplicated words

Closes gh-18004
2019-09-01 09:13:30 +02:00
dreis2211 3e35a6616c Fix duplicated words
See gh-18004
2019-09-01 09:09:38 +02:00
Stephane Nicoll 4f696441cf Merge pull request #18077 from freekry
* pr/18077:
  Simplify some code

Closes gh-18077
2019-09-01 09:06:15 +02:00
freekry e1611287c8 Simplify some code
See gh-18077
2019-09-01 09:05:53 +02:00
Phillip Webb 58734873dd Merge branch '2.1.x'
Closes gh-18081
2019-08-31 08:43:02 -07:00
Phillip Webb e07889b092 Document that Filter beans are eagerly initialized
Closes gh-17814
2019-08-31 08:41:34 -07:00
Phillip Webb 117a2ecda9 Merge branch '2.1.x'
Closes gh-18080
2019-08-31 08:30:06 -07:00
Phillip Webb 7e60f4b32a Clarify "YAML Shortcomings" documentation
Closes gh-17933
2019-08-31 08:29:03 -07:00
Phillip Webb d655684135 Merge branch '2.1.x'
Closes gh-18079
2019-08-31 07:44:34 -07:00
Phillip Webb ffbd11caba Document logger environment variable restrictions
Update the reference guide with a note about using environment variables
to configure logging.

Closes gh-17958
2019-08-31 07:43:42 -07:00
Andy Wilkinson f65a290ad9 Merge branch '2.1.x' 2019-08-31 11:00:22 +01:00
Andy Wilkinson 37d3ce03f8 Revert "Upgrade to Jetty 9.4.20.v20190813"
This reverts commit f6f99d7855 as 9.4.20
includes an incompatible class change where an abstract class in
Jetty's public API was changed to an interface, making it incompatible
with Framework 5.1.9.

See gh-18035
2019-08-31 11:00:12 +01:00
Andy Wilkinson 225ed4b7d6 Upgrade to Maven Site Plugin 3.8.2
Closes gh-18075
2019-08-31 09:06:53 +01:00
Andy Wilkinson d14352fad9 Upgrade to Snakeyaml 1.25
Closes gh-18074
2019-08-31 09:06:52 +01:00
Andy Wilkinson 7e9a974cc0 Upgrade to Webjars Locator Core 0.40
Closes gh-18073
2019-08-31 09:06:51 +01:00
Andy Wilkinson 9dd8c689e6 Upgrade to Slf4j 1.7.28
Closes gh-18072
2019-08-31 09:06:50 +01:00
Andy Wilkinson bf37aa622a Upgrade to Selenium Htmlunit 2.36.0
Closes gh-18071
2019-08-31 09:06:49 +01:00
Andy Wilkinson 0d4ad44446 Upgrade to Reactive Streams 1.0.3
Closes gh-18070
2019-08-31 09:06:48 +01:00