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

23212 Commits

Author SHA1 Message Date
Phillip Webb a3cde7fd8d Fix typo 2019-09-04 22:20:14 -07:00
Phillip Webb 877c65c714 Merge branch '2.1.x' 
Closes gh-18132
 2019-09-04 22:10:28 -07:00
Phillip Webb a0a204ae6a Clarify devtools trigger file documentation 
Closes gh-17775
 2019-09-04 22:09:33 -07:00
Phillip Webb 7511502471 Merge branch '2.1.x' 2019-09-04 14:55:07 -07:00
Phillip Webb 7c7ad03e1e Remove `stop_docker` from CI script 
Update our CI script to no longer attempt to stop docker. We don't
call it anyway and it will be one less moving part trying to diagnose
why `dockerd` sometimes terminates early.

See gh-18127
 2019-09-04 14:51:33 -07:00
Phillip Webb ebae76b1b8 Protect against null BindHandler.onStart result 
Fixes gh-18129
 2019-09-04 14:02:26 -07:00
Phillip Webb 1851f7119f Merge branch '2.1.x' 2019-09-04 13:53:28 -07:00
Phillip Webb f1bbb2a017 Fix documentation typos 
See gh-16718
 2019-09-04 13:52:10 -07:00
Andy Wilkinson 13b45b42c7 Align with breaking API changes in latest Security snapshots 
See gh-17897
 2019-09-04 14:55:50 +01:00
Andy Wilkinson 4b5ebd8505 Process all non-private methods, not just public methods 
Previously, the configuration processor would ignore any
@ConfigurationProperties-annotated methods that were not public. This
prevented metadata generation for package-private @Bean methods such
as those in DataSourceConfiguration's inner-classes for DBCP2, Hikari,
and Tomcat JDBC.

This commit updates the annotation processor so that it will process
any non-private method annotated with @ConfigurationProperties.

Fixes gh-18124
 2019-09-04 14:26:12 +01:00
Andy Wilkinson d5b289c02f Merge branch '2.1.x' 2019-09-04 10:15:20 +01:00
Andy Wilkinson 29080b87ec Protect autoconfigure module against slow starting test containers 2019-09-04 10:15:10 +01:00
Andy Wilkinson 8190b8eafb Merge branch '2.1.x' 
Closes gh-18125
 2019-09-04 09:54:26 +01:00
Andy Wilkinson 7f62c5a283 Provide a How-To for customizing Reactor Netty's TcpClient 
Closes gh-17856
 2019-09-04 09:49:56 +01:00
Phillip Webb 5c665ddd55 Merge branch '2.1.x' 
Closes gh-18120
 2019-09-03 21:04:43 -07:00
Phillip Webb da1d7cff14 Merge pull request #16718 from Tetsuya3850 
* pr/16718:
  Polish "Document the pros and cons of MockMvc"
  Document the pros and cons of MockMvc

Closes gh-16718
 2019-09-03 21:04:22 -07:00
Phillip Webb 624c118cdf Polish "Document the pros and cons of MockMvc" 
See gh-16718
 2019-09-03 21:03:46 -07:00
Tetsuya Hasegawa 8f8a4af001 Document the pros and cons of MockMvc 
Update the MockMvc documentation to provide more details about the
pros and cons of such an approach, specifically calling out the
difference with error page handling.

See gh-16718
 2019-09-03 21:01:44 -07:00
Phillip Webb b43edf5493 Merge branch '2.1.x' 
Closes gh-18118
 2019-09-03 18:20:24 -07:00
Phillip Webb 827c624b22 Merge pull request #16901 from michaldo 
* pr/16901:
  Extend documentation on logback include files
  Clarify documentation on logback include files

Closes gh-16901
 2019-09-03 18:19:59 -07:00
Phillip Webb 158e25c00f Extend documentation on logback include files 
Expand the Logback "How To" to provide further clarifications on
the different include files available.

See gh-16901
 2019-09-03 18:18:09 -07:00
michal 1f97a60d16 Clarify documentation on logback include files 
Update documentation and comments on Logback to show the correct
use of `default.xml` rather than `base.xml`.

See gh-16901
 2019-09-03 18:15:59 -07:00
Phillip Webb c1a16f5f21 Merge branch '2.1.x' 
Closes gh-18117
 2019-09-03 16:56:34 -07:00
Phillip Webb 43108d5495 Add @SpringBootApplication.scanBasePackages note 
Update the javadoc to note that `scanBasePackages` only affects the
`@ComponentScan` annotation and isn't a replacement for `@EntityScan`
or `@Enable...Repositories`.

Closes gh-18109
 2019-09-03 16:51:06 -07:00
Phillip Webb 4fa41054d5 Merge branch '2.1.x' 
Closes gh-18116
 2019-09-03 16:12:55 -07:00
Phillip Webb 8e6dbae402 Build CI images in parallel 
Closes gh-18115
 2019-09-03 16:10:42 -07:00
Phillip Webb 625f4e6dec Merge branch '2.1.x' 
Closes gh-18114
 2019-09-03 15:46:00 -07:00
Phillip Webb 42ba3050bc Upgrade CI images to Ubuntu Bionic 20190807 
Closes gh-18113
 2019-09-03 15:44:50 -07:00
Phillip Webb 013a8fcd03 Merge branch '2.1.x' 
Closes gh-18112
 2019-09-03 15:36:52 -07:00
Phillip Webb 3639776ec2 Upgrade CI to docker 19.03.2 
Closes gh-18111
 2019-09-03 15:35:46 -07:00
Phillip Webb 75a6397b52 Merge branch '2.1.x' 
Closes gh-18110
 2019-09-03 14:35:35 -07:00
Phillip Webb f79dad6082 Merge pull request #16477 from schuch 
* pr/16477:
  Polish "Fallback to ping if Solr URL references core"
  Fallback to ping if Solr URL references core

Closes gh-16477
 2019-09-03 14:20:35 -07:00
Phillip Webb e8d9b6f498 Polish "Fallback to ping if Solr URL references core" 
See gh-16477
 2019-09-03 14:20:17 -07:00
Markus Schuch b9764e8de8 Fallback to ping if Solr URL references core 
Update `SolrHealthIndicator` to fallback to a basic ping operation if
the `baseUrl` references a particular core rather than the root context.

Prior to this commit, if the Solr `baseUrl` pointed to a particular
core then the health indicator would incorrectly report `DOWN`.

See gh-16477
 2019-09-03 14:03:25 -07:00
Andy Wilkinson 57d68c6a6e Merge pull request #17872 from wanderrful 
* gh-17872:
  Polish "Support multiple drives when running CLI using Cygwin"
  Support multiple drives when running CLI using Cygwin

Closes gh-17872
 2019-09-03 17:22:26 +01:00
Andy Wilkinson 308f2db930 Polish "Support multiple drives when running CLI using Cygwin" 
See gh-17872
 2019-09-03 17:22:08 +01:00
Wanderrful 584a562970 Support multiple drives when running CLI using Cygwin 
See gh-17872
 2019-09-03 17:21:40 +01:00
Andy Wilkinson 6daab5c8ef Merge branch '2.1.x' 
Closes gh-18108
 2019-09-03 13:33:12 +01:00
Andy Wilkinson ca6395c388 Merge pull request #18100 from izeye 
* gh-18100:
  Fix typo in deprecation reason for liquibase.check-change-log-location

Closes gh-18100
 2019-09-03 13:32:45 +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
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