Commit Graph

6897 Commits

Author SHA1 Message Date
Camille Vienot 1917e1eac5 Support zip64 jars
See gh-16091
2019-09-20 12:44:04 +01:00
Andy Wilkinson d5fc324537 Upgrade to Asciidoctor Maven Plugin 1.6.0
Closes gh-17234
2019-09-20 11:59:16 +01:00
Johnny Lim 0243cfa23e Fix a broken Asciidoctor syntax
Along the way, this commit also fixes a typo.

See gh-18288
2019-09-20 08:50:53 +02:00
Madhura Bhave 02759d65bf Merge branch '2.1.x' 2019-09-19 16:32:11 -07:00
Madhura Bhave f9d94c6ed0 Remove duplicate word in docs 2019-09-19 16:30:25 -07:00
Andy Wilkinson 39c1e47eb7 Use 3 decimal places at most for logged startup time
Fixes gh-18278
2019-09-19 10:18:23 +01:00
Andy Wilkinson 7d3e53c94c Fix test expectations for run-fork JVM args on Java 13+
Closes gh-17008
2019-09-19 10:07:03 +01:00
Stephane Nicoll 19115d19f0 Merge branch '2.1.x'
Closes gh-18283
2019-09-19 09:24:14 +02:00
Alessandro Falappa 6dab9bb224 Fix pre-defined logging group documentation
See gh-18270
2019-09-19 09:19:24 +02:00
Johnny Lim b70be97cbf Polish
See gh-18281
2019-09-19 09:03:38 +02:00
Andy Wilkinson d2b28ceba5 Don't add -Xverify:none to JVM args when running on Java 13
Closes gh-17008
2019-09-18 21:51:41 +01:00
Brian Clozel ce2c26e934 Use Reactor's new Schedulers.boundedElastic()
Prior to this commit, Spring Boot would use `Schedulers.elastic()` when
required to process blocking tasks in a reactive environment.
reactor/reactor-core#1804 introduced a new scheduler,
`Schedulers.boundedElastic()` that behaves quite similarly but:

* will limit the number of workers thread
* will queue tasks if no worker thread is available and reject them is
the queue is exceeds a limit

This allows Spring Boot to schedule blocking tasks as before and allows
greater flexibility.

Fixes gh-18269
See gh-18276
2019-09-18 22:17:07 +02:00
Andy Wilkinson 9377b9a9e4 Support -- and # by default as Quartz datasource init comment prefixes
Closes gh-17435
2019-09-18 20:38:16 +01:00
rajadilipkolli abcff3a3b3 Use try-with-resources in HttpTunnelPayload
See gh-11779
2019-09-18 17:49:24 +01:00
Andy Wilkinson 9d3586d0b8 Test DatabaseDriver.ORACLE now it's available from Maven Central
Closes gh-18274
2019-09-18 17:08:18 +01:00
Andy Wilkinson dce9d3da82 Add dependency management for Oracle's JDBC driver
Closes gh-18242
2019-09-18 17:06:42 +01:00
Andy Clement 4fecefe149 Add Graal checks ahead of some interactions with ClassLoader methods
See gh-18262
2019-09-18 09:58:33 +01:00
Andy Wilkinson b15e427a3e Improve handling of non-standard status codes in WebFluxTags
Closes gh-18267
2019-09-18 09:52:39 +01:00
Andy Wilkinson 6534047fcf Rework test slice annotation javadoc to reflect JUnit 5 default
Closes gh-18178
2019-09-17 17:32:29 +01:00
Alessandro Falappa 38fb16a79d Fix typos in HealthContributors definition
See gh-18249
2019-09-17 12:38:33 +01:00
Andy Wilkinson 5ea994d955 Merge pull request #18248 from AlexFalappa
* gh-18248:
  Remove duplicated row from HealthIndicators table

Closes gh-18248
2019-09-17 12:37:23 +01:00
Alessandro Falappa 4aa186d6e5 Remove duplicated row from HealthIndicators table
See gh-18248
2019-09-17 12:36:51 +01:00
Andy Wilkinson c662c404c5 Do not enable H2C by default when using Reactor Netty
Previously, Reactor Netty was the only embedded server that enabled
H2C by default. This commit updates the factory to only enable HTTP/2
when SSL has also been configured, aligning it with Jetty, Tomcat,
and Undertow.

If H2C is required, it can be enabled using a NettyServerCustomizer:

@Bean
NettyServerCustomizer h2cCustomizer() {
    return (httpServer) ->
           httpServer.protocol(HttpProtocol.HTTP11, HttpProtocol.H2C);
}

Closes gh-17867
2019-09-17 10:57:24 +01:00
Andy Wilkinson d5adbbb626 Split appendices into multiple pages and include a ToC in each
Closes gh-16289
2019-09-17 09:44:40 +01:00
Stephane Nicoll 81ddebbc27 Merge branch '2.1.x'
Closes gh-18239
2019-09-16 15:12:38 +02:00
Stephane Nicoll 9434cb0e22 Keep a live reference of protocol resolvers rather than copying them
This commit makes sure that any subsequent call on addProtocolResolver
on the context will impact the ResourceLoader implementation that
DevTools sets on the context.

This makes sure that any custom ProtocolResolver that is set later in
the lifecycle is taken into account.

Closes gh-17214
2019-09-16 15:08:40 +02:00
Stephane Nicoll b3b6605713 Merge branch '2.1.x'
Closes gh-18236
2019-09-16 14:23:26 +02:00
Stephane Nicoll a642421661 Force creation of sources jar
Closes gh-18212
2019-09-16 14:22:26 +02:00
Andy Wilkinson 448f5b8650 Simplify error page config by dropping redundant support for Tomcat 7
Closes gh-17937
2019-09-16 11:48:02 +01:00
Andy Wilkinson 84b2438c4c Upgrade to Jersey 2.29.1
Closes gh-17430
2019-09-16 11:32:02 +01:00
Andy Wilkinson cc67213b1f Correct capitalization of GemFire in the reference docs
Closes gh-18001
2019-09-16 11:28:50 +01:00
Andy Wilkinson 6f20ba9550 Remove mention of Spring IO Platform from reference docs
Closes gh-17986
2019-09-16 11:22:36 +01:00
Phillip Webb ad32603635 Restore compatibility with MockRestServiceServer
Closes gh-17885
2019-09-16 10:17:41 +02:00
Stephane Nicoll 3d5530d15d Merge branch '2.1.x'
Closes gh-18234
2019-09-16 10:03:19 +02:00
leoli a0d2721e33 Use custom port for RSocket server over websocket
Prior to this change, the custom port configured for the RSocket
server would not be used if the server factory is using the
websocket transport and is provided with a custom
`ReactorResourceFactory`.

Fixes gh-18200
2019-09-16 09:53:10 +02:00
Stephane Nicoll 9065c4997d Fix rebase from master 2019-09-16 09:52:55 +02:00
Stephane Nicoll e05f42f0f3 Polish Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter"
See gh-18214
2019-09-16 09:44:01 +02:00
Leonard Brünings b9c8d7dd60 Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter
See gh-18214
2019-09-16 09:42:55 +02:00
Stephane Nicoll a0d7d52106 Polish "Add ROLLING_FILE_NAME_PATTERN for File Appender"
See gh-18151
2019-09-16 09:28:15 +02:00
Eddú Meléndez 4a3810a0f1 Add ROLLING_FILE_NAME_PATTERN for File Appender
This new property allows to customize `fileNamePattern` if it is set.
Otherwise, a default pattern remains. Also, new property is supported
`logging.pattern.rolling-file-name`.

See gh-18151
2019-09-16 09:15:59 +02:00
Phillip Webb 06f46baa9d Build against Spring Framework 5.2.0 snapshots
See gh-18232
2019-09-13 16:22:13 -07:00
Andy Wilkinson 2e6f15b6f3 Fix intermittent failure of inMemoryDerbyIsShutdown 2019-09-13 20:50:24 +01:00
Andy Wilkinson 1b237de5f5 Use Awaitility in our own tests
Closes gh-18227
2019-09-13 20:50:14 +01:00
Andy Wilkinson 568caa1206 Add dependency management for Awaitility
Closes gh-18205
2019-09-13 18:02:50 +01:00
Andy Wilkinson 47eee7bec8 Merge branch '2.1.x'
Closes gh-18226
2019-09-13 18:00:25 +01:00
Andy Wilkinson b1ca1ae6e9 Add missing dependency management for Janino modules
Closes gh-18225
2019-09-13 17:59:59 +01:00
Andy Wilkinson b9bb84236b Restore compatibility with Flyway 5.2
Previously, the upgrade to Flyway 6 broke compatibility with Flyway
5.2 due to the use of method references that refer to two methods
that do not exist in Flyway 5.2.

This commit replaces the method references with lambdas that are only
called if the user sets the related property. Unless a new-in-Flyway-6
property is set, the auto-configuration will work as before. When such
a property is set the auto-configuration will fail with a
NoSuchMethodError. This approach was chosen to make the
incompatibility clear.

We have also introduced support for passing any JavaMigration beans
in the context into Flyway. This too relies on API that is new in
Flyway 6. It is possible (although unlikely) that users had
JavaMigration beans in Spring Boot 2.1 that were being ignored. This
commit restores this behaviour when using Flyway 5.2.

Closes gh-18193
2019-09-13 10:26:59 +01:00
Stephane Nicoll b5589f8abe Merge branch '2.1.x'
Closes gh-18222
2019-09-13 09:06:50 +02:00
Peter Sauer dba18ce778 Fix minor typo
The phrase `We have you covered.` is a sentence and so it should start
with a capital `W`.

See gh-18216
2019-09-13 09:05:54 +02:00
Phillip Webb 8e398e164c Fix checkstyle violations 2019-09-12 15:23:32 -07:00
Phillip Webb eea5d15412 Merge branch '2.1.x'
Closes gh-18219
2019-09-12 15:11:13 -07:00
Phillip Webb 23174eb484 Remember annotations when using withExistingValue
Update `Bindable` builder methods so that existing annotations are
retained.

Closes gh-18218
2019-09-12 15:09:47 -07:00
Stephane Nicoll 70f7e47002 Polish "Use Duration for ServerProperties.Jetty.idleTimeout"
See gh-18206
2019-09-12 15:13:31 +02:00
Johnny Lim 96019362f7 Use Duration for ServerProperties.Jetty.idleTimeout
See gh-18206
2019-09-12 14:59:54 +02:00
Johnny Lim 5b41c3b608 Polish
See gh-18192
2019-09-12 14:55:47 +02:00
Brian Clozel 219bafaba1 Apply RSocket server customizers to netty web server
This commit applies `ServerRSocketFactoryCustomizer` beans to RSocket
setups when the RSocket server is being plugged into an existing Reactor
Netty web server.

Fixes gh-18208
2019-09-11 21:09:43 +02:00
Andy Wilkinson f033016364 Allow @Component on mutable @ConfigurationProperties
Update configuration properties support to allow the `@Component`
annotation to be used on `@ConfigurationProperties` beans as long
as they are mutable.

This restores the behavior of Spring Boot 2.1 for mutable beans whilst
still allowing us to enforce the stricter rules for immutable value
object configuration properties.

Closes gh-18138
2019-09-09 23:04:50 -07:00
wonwoo b321dacc1c Fix typo in javadoc
See gh-18187
2019-09-09 15:22:21 +02:00
Andy Wilkinson 0074a7c662 Merge branch '2.1.x' 2019-09-09 14:03:55 +01:00
Andy Wilkinson 4f21b51a2b Polish one sentence per line in the reference docs 2019-09-09 14:00:12 +01:00
Stephane Nicoll a56eb4b974 Fix typo 2019-09-09 14:23:24 +02:00
Stephane Nicoll ae34ae78dc Polish "Remove management.health.status.order from docs"
See gh-18170
2019-09-09 14:13:46 +02:00
dreis2211 0975b5b220 Fix link formatting in custom HealthIndicator section
See gh-18170
2019-09-09 14:13:23 +02:00
dreis2211 7a49651e09 Remove management.health.status.order from docs
See gh-18170
2019-09-09 14:13:04 +02:00
Stephane Nicoll 14a676052f Polish
This commit moves `@ConfigurationProperties` to the `@Bean` factory
method as this is unusual to put it at class level if it's exposed
that way.

As HealthIndicatorProperties has a constructor, this makes sure that
the annotation processor enables JavaBean binding mode.
2019-09-09 13:37:54 +02:00
Stephane Nicoll 39fed4a9d9 Fix binding detection of ConfigurationProperties contributed by @Bean
This commit makes sure that a ConfigurationProperties type contributed
by a `@Bean` factory method uses properties binding regardless of the
presence of a matching constructor.

`@Bean` method makes sure the user is in control and will be responsible
of creating the instance. As a result, binding of properties will not
happen there and therefore can only happen with regular JavaBean
accessors.

Closes gh-18184
2019-09-09 13:29:31 +02:00
Andy Wilkinson 0c0e2dd54b Merge branch '2.1.x'
Closes gh-18186
2019-09-09 11:16:30 +01:00
Andy Wilkinson 674d3dd262 Polish health endpoint documentation for groups and nesting
Closes gh-14022
2019-09-09 11:02:39 +01:00
Andy Wilkinson 7b1e10ed00 Use one sentence per line in Actuator and Gradle plugin doc source
Closes gh-18185
2019-09-09 10:59:49 +01:00
gaohanghang 74d2fe472a Simplify code
See gh-18175
2019-09-09 09:51:55 +02:00
Andy Wilkinson 41111ac96f Upgrade to Junit Jupiter 5.5.2
Closes gh-18182
2019-09-09 07:00:53 +01:00
Andy Wilkinson ba6bd12898 Upgrade to Glassfish El 3.0.3
Closes gh-18181
2019-09-09 07:00:52 +01:00
Andy Wilkinson 35c01e3f08 Upgrade to Micrometer 1.2.1
Closes gh-18180
2019-09-09 07:00:51 +01:00
dreis2211 09e991ca1c Fix broken links for master snapshot builds
See gh-18172
2019-09-08 08:36:28 +02:00
Andy Wilkinson 2472836c48 Upgrade to Spring Session Bom Corn-M4
Closes gh-17903
2019-09-07 10:54:54 +01:00
Andy Wilkinson 9b6a425f91 Upgrade to Spring Batch 4.2.0.RC1
Closes gh-17899
2019-09-07 07:56:35 +01:00
Andy Wilkinson 9262a55892 Upgrade to Spring Kafka 2.3.0.RC1
Closes gh-17902
2019-09-06 20:28:00 +01:00
Andy Wilkinson 57d2c38dee Upgrade to Spring AMQP 2.2.0.RC1
Closes gh-17898
2019-09-06 20:27:24 +01:00
Andy Wilkinson c4e2784ac2 Upgrade to Spring Integration 5.2.0.RC1
Closes gh-17901
2019-09-06 20:26:46 +01:00
Andy Wilkinson 87c7307d28 Upgrade to Spring Security 5.2.0.RC1
Closes gh-17897
2019-09-06 20:25:48 +01:00
Andy Wilkinson 80b8f19961 Tune @ConditionalOnMissingBean for interface-based back off
Previously, a number of usages of @ConditionalOnMissingBean prevented
a bean that implements an auto-configured bean's "main" interface from
causing the auto-configuration of the bean to back off. This would
happen when @ConditionalOnMissingBean did not specify a type, the
@Bean method returned the bean's concrete type, and that concreate
type implements a "main" interface.

This commit updates such usages of @ConditionalOnMissingBean to
specify the "main" interface as the type of the bean that must be
missing. This will allow, for example, the auto-configured
MongoTemplate bean to back off when a MongoOperations bean is defined.
2019-09-06 17:55:06 +01:00
Andy Wilkinson ff1983c9ae Merge branch '2.1.x'
Closes gh-18168
2019-09-06 14:38:45 +01:00
Andy Wilkinson 795c2f225f Support getComment() on a nested JarFile
Previously, calling getComment() on a nested jar file would result
in the outer jar file's comment being returned.

This commit updates the loader's JarFile to read the file's comment
from the central directory end record and return it from getComment().

Fixes gh-18128
2019-09-06 14:29:48 +01:00
Andy Wilkinson fc1889ee72 Merge branch '2.1.x'
Closes gh-18167
2019-09-06 14:04:54 +01:00
dreis2211 ae30515e5e Test the Gradle Plugin against Gradle 5.6.2
See gh-18164
2019-09-06 13:19:08 +01:00
Andy Wilkinson 71d5d481ad Merge branch '2.1.x'
Closes gh-18165
2019-09-06 13:07:58 +01:00
Andy Wilkinson 19ccfaea86 Fix QuartzAutoConfiguration when Liquibase is not on the class path
Fixes gh-18153
2019-09-06 13:05:53 +01:00
Andy Wilkinson 715e90437f Merge branch '2.1.x' 2019-09-06 12:47:06 +01:00
Andy Wilkinson 8882c532cd Correct attribute references in reference documentation
Fixes gh-18163
2019-09-06 12:45:35 +01:00
Andy Wilkinson 07eb1815b2 Upgrade to Spring Data Moore-RC3
Closes gh-17900
2019-09-06 11:14:01 +01:00
Andy Wilkinson 628854c53d Upgrade to Neo4j Ogm 3.2.0-RC2
Closes gh-18162
2019-09-06 11:12:18 +01:00
Andy Wilkinson 6de723e225 Upgrade to Jooq 3.12.1
Closes gh-18161
2019-09-06 11:12:17 +01:00
Andy Wilkinson 283c67713a Upgrade to Kotlin Coroutines 1.3.1
Closes gh-18160
2019-09-06 11:12:16 +01:00
Andy Wilkinson a0a214de24 Upgrade to Elasticsearch 6.8.3
Closes gh-18159
2019-09-06 11:12:15 +01:00
Andy Wilkinson f799e1dcd9 Upgrade to Ehcache3 3.8.1
Closes gh-18158
2019-09-06 11:12:13 +01:00
Andy Wilkinson 9554bf5eff Upgrade to Jakarta Ws Rs 2.1.6
Closes gh-18157
2019-09-06 11:12:12 +01:00
Andy Wilkinson e922e2ab66 Upgrade to Jakarta Websocket 1.1.2
Closes gh-18156
2019-09-06 11:12:11 +01:00
Andy Wilkinson 03314a752e Upgrade to Jakarta Servlet Jsp Jstl 1.2.7
Closes gh-18155
2019-09-06 11:12:11 +01:00
Andy Wilkinson 61cbb1cade Upgrade to Jakarta Servlet 4.0.3
Closes gh-18154
2019-09-06 11:12:09 +01:00
Andy Wilkinson 1f875d552a Polish "Add a config property for JMS listener container's receive timeout"
See gh-17332
2019-09-05 21:42:13 +01:00
ibmmqmet 1cde657861 Add a config property for JMS listener container's receive timeout
See gh-17332
2019-09-05 21:30:53 +01:00
Andy Wilkinson 6328f2e8a8 Polish "Make logError() in AbstractErrorWebExceptionHandler overrideable"
See gh-17863
2019-09-05 21:18:21 +01:00
Peter Jurkovic 7ea612beaf Make logError() in AbstractErrorWebExceptionHandler overrideable
See gh-17863
2019-09-05 21:04:45 +01:00
Andy Wilkinson e8de5a6d95 Provide a public API for determining a request's outcome
Closes gh-18150
2019-09-05 20:54:35 +01:00
dreis2211 a2a672de0e Improve handling of non-standard status codes in WebMvcTags
See gh-17998
2019-09-05 20:34:25 +01:00
Andy Wilkinson 4069d855e8 Upgrade to Spring HATEOAS 1.0.0.RC2
Closes gh-17904
2019-09-05 17:16:30 +01:00
Andy Wilkinson 58eddb8fa4 Become compatible with Jackson 2.10 while remaining 2.9 compatible
See gh-17999
2019-09-05 17:13:45 +01:00
Stephane Nicoll 743351e067 Upgrade to Httpcore 4.4.12
Closes gh-18147
2019-09-05 14:44:45 +02:00
Stephane Nicoll 798fe069ce Upgrade to Activemq 5.15.10
Closes gh-18146
2019-09-05 14:44:44 +02:00
Stephane Nicoll a4582307da Upgrade to Undertow 2.0.26.Final
Closes gh-18145
2019-09-05 14:44:43 +02:00
Stephane Nicoll 9cd93ac98f Upgrade to Httpcore 4.4.12
Closes gh-18144
2019-09-05 14:41:40 +02:00
Stephane Nicoll 5fe4f3b25a Upgrade to Activemq 5.15.10
Closes gh-18143
2019-09-05 14:41:39 +02:00
Stephane Nicoll fd77fd4f05 Upgrade to Undertow 2.0.26.Final
Closes gh-18142
2019-09-05 14:41:38 +02:00
Stephane Nicoll e978f9ac8e Upgrade to Reactor Bom Californium-SR11
Closes gh-18141
2019-09-05 14:41:37 +02:00
Stephane Nicoll e7474b55de Upgrade to Reactor Dysprosium-RC1
Closes gh-17895
2019-09-05 13:10:20 +02:00
Stephane Nicoll 359279b1fb Upgrade to Spring Framework 5.2.0.RC2
Closes gh-17896
2019-09-05 13:08:59 +02:00
Stephane Nicoll 7cb2eb1850 Polish "Polish test"
See gh-18130
2019-09-05 08:54:35 +02:00
Eddú Meléndez 16a0188666 Polish test
See gh-18130
2019-09-05 08:54:06 +02:00
Stephane Nicoll 85a44dff64 Upgrade to Micrometer 1.1.6
Closes gh-18133
2019-09-05 08:28:06 +02:00
Phillip Webb f70c0b8fbb Merge branch '2.1.x' 2019-09-04 22:20:27 -07:00
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 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 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 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 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 75a6397b52 Merge branch '2.1.x'
Closes gh-18110
2019-09-03 14:35: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 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
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