Commit Graph

6267 Commits

Author SHA1 Message Date
Brian Clozel 2830847344 Optimize reactor operators in actuator support
This commit uses native Reactor operators `Mono.fromCallable` and
`subscribeOn` for better performance and support.

Fixes gh-17452
2019-07-10 12:06:26 +02:00
dreis2211 25586a2e23 Use Assertions.contentOf() where possible
See gh-17444
2019-07-10 06:40:52 +01:00
Johnny Lim 255469b82f Add Javadoc `@since` tags for new additional Tomcat connectors methods
See gh-17473
2019-07-10 06:32:16 +01:00
dreis2211 32549cfc85 Remove folder that only contains package-info
See gh-17471
2019-07-10 06:24:40 +01:00
Andy Wilkinson be3a737532 Merge branch '2.1.x'
Closes gh-17470
2019-07-09 20:05:30 +01:00
Andy Wilkinson 6748b20863 Prevent JUL loggers from being GCed once their level has been set
Fixes gh-17217
2019-07-09 19:51:55 +01:00
Stephane Nicoll c7311631c0 Merge branch '2.1.x'
Closes gh-17467
2019-07-09 18:01:28 +02:00
Stephane Nicoll 3fb15a502b Remove outdated reference to Guava in the reference guide
Closes gh-17446
2019-07-09 18:00:57 +02:00
Dmytro Nosan fd9e8503bb Polish BatchAutoConfiguration
See gh-17462
2019-07-09 16:56:16 +01:00
Andy Wilkinson edff0f87e2 Merge branch '2.1.x'
Closes gh-17466
2019-07-09 16:52:13 +01:00
Andy Wilkinson acd9b61c8e Make Batch JPA auto-configuration back off without a DataSource
Fixes gh-17465
2019-07-09 15:46:45 +01:00
Andy Wilkinson a40bc64f6e Merge branch '2.1.x'
Closes gh-17463
2019-07-09 15:14:41 +01:00
Andy Wilkinson c5241f0e82 Remove accidental usage of com.hazelcast.util.Base64
Closes gh-17461
2019-07-09 15:03:31 +01:00
Andy Wilkinson d93c79316d Align with body method changes in RequestBodySpec
Closes gh-17460
2019-07-09 12:13:23 +01:00
Andy Wilkinson 3e6c15c451 Deprecate auto-configuration for Joda-Time
Closes gh-17419
2019-07-09 11:52:36 +01:00
Andy Wilkinson 9f253603db Drop -d option from CLI as it was not POSIX compliant
Closes gh-16663
2019-07-09 09:48:49 +01:00
Johnny Lim 426ef749db Polish
See gh-17413
2019-07-09 07:40:30 +02:00
Madhura Bhave 939a247d87 Merge pull request #17448 from izeye
* pr/17448:
  Fix typo

Closes gh-17448
2019-07-08 16:04:35 -07:00
Johnny Lim e42f4d0279 Fix typo
See gh-17448
2019-07-08 16:04:12 -07:00
Andy Wilkinson b0626bca32 Merge branch '2.1.x'
Closes gh-17454
2019-07-08 15:54:04 +01:00
Andy Wilkinson 02bea78229 Retain as much Batch auto-config as possible without Spring JDBC
Closes gh-17451
2019-07-08 15:35:16 +01:00
Andy Wilkinson 5b7c0e0c58 Merge branch '2.1.x'
Closes gh-17453
2019-07-08 14:44:34 +01:00
Andy Wilkinson a023f308ed Make JDBC-based batch configurer back off without a DataSource
Closes gh-17449
2019-07-08 14:43:26 +01:00
Andy Wilkinson 072453bf58 Polish "Add support for configuring a Batch-specific DataSource"
See gh-17375
2019-07-08 13:16:47 +01:00
Dmytro Nosan f449665e2a Add support for configuring a Batch-specific DataSource
See gh-17375
2019-07-08 13:15:24 +01:00
Andreas Gebhardt ed7cfedb51 Fix JavaDoc within spring-boot-test-support
See gh-17443
2019-07-08 12:48:02 +01:00
Andy Wilkinson 3ba25b9ee9 Simplify class loading check in pooled DataSource condition
Closes gh-17284
2019-07-08 12:19:55 +01:00
Andy Wilkinson 638b4b8186 Rename methods to make copying behaviour more clear
Closes gh-17441
2019-07-05 19:09:19 +01:00
Andy Wilkinson b39479bc07 Polish "Add config property for Kafka consumer isolation level"
See gh-17389
2019-07-05 17:23:45 +01:00
Ryan Dunckel 1b8f955fec Add config property for Kafka consumer isolation level
See gh-17389
2019-07-05 17:16:58 +01:00
Andy Wilkinson 0d124e9857 Remove use of field injection from spring-boot-devtools
Closes gh-17442
2019-07-05 14:59:01 +01:00
Andy Wilkinson bd22ca0268 Polish 2019-07-04 19:36:32 +01:00
Andy Wilkinson 2816635418 Polish 2019-07-04 17:51:20 +01:00
Andy Wilkinson 4b2a116fa7 Use String indexOf(char) and lastIndexOf(char) where possible
Closes gh-11416
2019-07-04 17:44:40 +01:00
Andy Wilkinson 6a777a7f9b Disable HiddenHttpMethodFilter by default
HiddenHttpMethodFilter can be problematic as it causes early
consumption of a request body if the body may contain parameters. This
happens as the filter needs to read the parameters to see if an
_method parameter is present. The filter is only beneficial for web
applications that are the hidden HTTP method functionality but is
potentially detriimental to all applications that are not. As such
we no longer believe that it should be enabled by default and users
should be required to opt in.

Closes gh-16953
2019-07-04 14:50:01 +01:00
Andy Wilkinson 2af815f2cf Merge branch '2.1.x'
Closes gh-17432
2019-07-04 12:56:22 +01:00
Andy Wilkinson 7f85aba546 Auto-configure Data Mongo if user provides MongoDbFactory but no client
Previously, if a user defined a MongoDbFactory bean but did not define
a client bean, MongoDataAutoConfiguration would back off leaving the
context without a MongoTemplate, etc.

This commit reworks the auto-configuration so that only the
auto-configuration of a MongoDbFactory is dependent on the existence
of a Mongo client bean. Auto-configuration of the other components
that depend on a MongoDbFactory will now continue in the absence of a
Mongo client bean.

Closes gh-17416
2019-07-04 12:36:03 +01:00
Andy Wilkinson 345c36828f Polish "Use Spring 5 module of Jersey"
See gh-17412
2019-07-04 10:26:39 +01:00
dreis2211 7c6fd31d06 Use Spring 5 module of Jersey
See gh-17412
2019-07-04 10:26:28 +01:00
Andy Wilkinson aa01bd3890 Polish "Polish GradleCompatibilityExtension's javadoc"
See gh-17411
2019-07-04 10:18:18 +01:00
dreis2211 dc4cc214fe Polish GradleCompatibilityExtension's javadoc
See gh-17411
2019-07-04 10:13:17 +01:00
Andy Wilkinson 9d5fa98334 Merge branch '2.1.x'
Closes gh-17429
2019-07-04 10:07:40 +01:00
Andy Wilkinson 7553b60e68 Test the Gradle Plugin against Gradle 5.5
Closes gh-17428
2019-07-04 10:05:57 +01:00
Phillip Webb 4483f41791 Don't validate using BeanPropertyBindingResult
Update `ValidationBindHandler` so that a custom `AbstractBindingResult`
is used rather than `BeanPropertyBindingResult`. This allows us to
validate results, regardless of whether the actual bound instance has
public getters or setter.

Closes gh-17424
2019-07-03 21:59:08 -07:00
Madhura Bhave 3bd7760f9c Polish "Allow Undertow's options to be configured via the environment
See gh-17356
2019-07-03 17:48:56 -07:00
HaiTao Zhang 417f4dd7fa Allow Undertow's options to be configured via the environment
See gh-17356
2019-07-03 17:20:31 -07:00
Madhura Bhave 39b15af5d6 Polish "Provide links / when using a separate management port"
See gh-17418
2019-07-03 16:19:40 -07:00
HaiTao Zhang c108629311 Provide links for actuators at / when using a separate management port
See gh-17418
2019-07-03 16:19:40 -07:00
Phillip Webb edea223841 Merge branch '2.1.x'
Closes gh-17422
2019-07-03 16:06:19 -07:00
Phillip Webb 2f88dd735e Polish 2019-07-03 15:52:51 -07:00
Phillip Webb cd5f40aec2 Validate onFailure returned binding results
Update `ValidationBindHandler` so that any non-null result returned by
the parent `onFailure` method triggers re-validation.

Fixes gh-17421
2019-07-03 15:52:51 -07:00
Phillip Webb d641a1e23a Polish BindHandler javaodc 2019-07-03 15:52:51 -07:00
Andy Wilkinson e0048f234b Polish 2019-07-03 21:59:51 +01:00
Andy Wilkinson c5cae28261 Add support for plain text thread dumps to the threaddump endpoint
When a request that accepts text/plain is received, the threaddump
endpoint will now return a thread dump in plain text. The format of
this text is modelled after the output produced by JVisualVM when
connecting to a remote process over JMX. Note that this output does
not include all of the information in, for example, JStack's output
as it is not available via Java 8's ThreadInfo API.

Rather than the custom formatting logic, using ThreadInfo's toString()
method was considered but its output is documented as being undefined
and implementation specific. The implementation used while developing
this feature produced output that did not match that of JStack or
JVisualVM and truncated stack traces quite considerably.

At the time of writing the format produced by the endpoint could be
consumed by both Thread Dump Analyzer [1] and https://fastthread.io.

Closes gh-2339

[1] https://github.com/irockel/tda
2019-07-03 21:51:56 +01:00
Phillip Webb a66c4d3096 Unify method visibility of private classes
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
2019-07-03 11:39:47 -07:00
Andy Wilkinson 40f66c80f8 Merge branch '2.1.x'
Closes gh-17409
2019-07-02 17:34:25 +01:00
Andy Wilkinson 82fd4ce9b9 Fix empty context path warning when using Jetty with WebFlux
Previously, the context path was set to an empty string. The led to
Jetty logging a warning about an empty context path and then using
/ instead.

This commit avoids the warning while leaving the context path's end
result unchanged by setting the context path to /.

Closes gh-17399
2019-07-02 17:24:34 +01:00
Andy Wilkinson e5549f7a21 Stop Jersey from pulling in duplicate classes with JDK 11+
Closes gh-17404
2019-07-02 16:17:13 +01:00
Andy Wilkinson 73cf11535d Ensure that logging system tests do not leave log files open
See gh-17107
2019-07-02 16:03:30 +01:00
Andy Wilkinson 0b8247bd62 Merge branch '2.1.x'
Closes gh-17408
2019-07-02 14:11:23 +01:00
Andy Wilkinson e57579461a Prevent endpoint's shutdown() method from being a destroy method
Closes gh-17407
2019-07-02 14:05:49 +01:00
Andy Wilkinson 0f6d0d1fb8 Upgrade to Sqlite Jdbc 3.28.0
Closes gh-17406
2019-07-02 13:50:15 +01:00
Andy Wilkinson 9d4ea49dbb Upgrade to Junit Jupiter 5.5.0
Closes gh-17405
2019-07-02 13:50:13 +01:00
Andy Wilkinson c1313e481f Upgrade to Jersey 2.29
Closes gh-17404
2019-07-02 13:50:12 +01:00
Andy Wilkinson bb499194c2 Upgrade to Log4j2 2.12.0
Closes gh-17403
2019-07-02 13:50:10 +01:00
Andy Wilkinson 9b34bd7c59 Upgrade to Kafka 2.3.0
Closes gh-17402
2019-07-02 13:50:09 +01:00
Andy Wilkinson 4ab4198168 Switch to Infinispan's Spring 5 integration
Closes gh-17333
2019-07-02 12:50:12 +01:00
Andy Wilkinson be320b8412 Merge branch '2.1.x'
Closes gh-17401
2019-07-02 11:48:01 +01:00
Andy Wilkinson 5997886897 Add dependency management for Infinispan's Spring 5 modules
This commit adds dependency management for Infinispan's Spring 5
modules that are introduced in 9.4.9.Final. It also removes redundant
exclusions for the dependency management for its Spring 4 modules.

Closes gh-17346
2019-07-02 11:41:33 +01:00
Vedran Pavic 8ed71b3c51 Start building against Spring Session Corn-M3 snapshots
See gh-17278
2019-07-02 09:33:16 +01:00
Andy Wilkinson c29cdfa33c Start building against Spring Batch 4.2.0.RC1 snapshots
See gh-17347
2019-07-02 09:01:48 +01:00
Andy Wilkinson b3a3aec0e0 Start building against Spring Security 5.2.0.RC1 snapshots
See gh-17349
2019-07-02 08:12:08 +01:00
Andy Wilkinson d4aa9825aa Start building against Spring Data Moore-RC2 snapshots
See gh-17350
2019-07-02 08:11:32 +01:00
Andy Wilkinson 7d27c6ff92 Remove note about special handling of off as it no longer applies
Closes gh-17385
2019-07-02 08:07:15 +01:00
Phillip Webb 07acc4af08 Consistently coerce booleans to enums
Rename `StringToEnumIgnoringCaseConverterFactory` to
`LenientStringToEnumConverterFactory` and extended it to support
binding of YAML style 'true'/'false' values to 'ON'/'OFF'.

Closes gh-17385
2019-07-01 22:55:18 -07:00
Phillip Webb 46b250549d Merge branch '2.1.x'
Closes gh-17396
2019-07-01 21:52:20 -07:00
Phillip Webb 206ba2ad86 Append chars not ints in getLettersAndDigits
Update `StringToEnumIgnoringCaseConverterFactory` so that the
`getLettersAndDigits` method correctly appends `char` elements
rather than `int` elements.

Closes gh-17327
2019-07-01 21:49:29 -07:00
Phillip Webb c94a7dfa04 Allow binding to package private methods
Closes gh-17394
2019-07-01 18:44:35 -07:00
Phillip Webb 27cce996fb Fix rsocket reference
See gh-12005
2019-07-01 12:00:04 -07:00
Phillip Webb 8d03214389 Import attributes from appendix files
See gh-12005
2019-07-01 11:59:59 -07:00
Phillip Webb 8fb181f31a Escape new '{reference}' elements in asciidoc
See gh-17387
2019-07-01 11:43:27 -07:00
Phillip Webb f20b100a25 Merge branch '2.1.x'
Closes gh-17387
2019-07-01 11:42:07 -07:00
Phillip Webb 88b6a3308c Escape additional '{reference}' elements in asciidoc
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:39:49 -07:00
Phillip Webb 61b771042d Restore version asciidoc variables
See gh-12005
2019-07-01 11:26:04 -07:00
Phillip Webb c2e3354be0 Drop asciidoc partintro formatting
Since to no longer use docbook, we can't use `partintro`.

See gh-12005
2019-07-01 11:19:37 -07:00
Phillip Webb fcbcc9d309 Merge branch '2.1.x'
Closes gh-17387
2019-07-01 11:04:54 -07:00
Phillip Webb a81f37dd68 Escape '{reference}' elements in asciidoc files
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:02:05 -07:00
dreis2211 15d4764185 Avoid bindable properties check when target has null value
See gh-16447
2019-07-01 17:11:58 +01:00
陈其苗 f86cfff77f Remove redundant invocation of getActiveProfiles
See gh-17271
2019-07-01 17:06:12 +01:00
Andy Wilkinson cca005f756 Merge branch '2.1.x'
Closes gh-17383
2019-07-01 15:57:41 +01:00
Andy Wilkinson 34e0db2c25 Merge branch '2.0.x' into 2.1.x
Closes gh-17382
2019-07-01 15:57:21 +01:00
Andy Wilkinson 0c44584b44 Merge branch '1.5.x' into 2.0.x 2019-07-01 15:57:00 +01:00
Andy Wilkinson 6791dbb786 Merge branch '2.1.x'
Closes gh-17381
2019-07-01 15:47:48 +01:00
Andy Wilkinson 4083c721f2 Fix URL normalization when replacing /./ with /
Previously, a regular expression of /./ was used to replace /./ with
/.  The '.'' in the expression matches any single character so the
replacement was more broadly applicable than it should have been. For
example, /a/ would be replaced with /.

This commit uses Pattern.LITERAL to compile the regular expression
from the CURRENT_DIR (/./) contant. This allows the constant to be
used to check for occurances of /./ in the string before attempting
replacement, while also ensuring that the '.' is treated literally.

Closes gh-17341
2019-07-01 15:42:54 +01:00
Andy Wilkinson df5d23ff6c Polish "Migrate LogbackLoggingSystemTests to JUnit 5"
See gh-17107
2019-06-29 23:20:47 +01:00
Ilya Lukyanovich 569830cdca Migrate LogbackLoggingSystemTests to JUnit 5
See gh-17107
2019-06-29 23:20:40 +01:00
Dmytro Nosan 011fea137e Allow multiple values to be specified when configuring a default header
See gh-17286
2019-06-29 23:06:39 +01:00
Dmytro Nosan 1d9aae8282 Introduce RedisCacheManagerBuilderCustomizer
See gh-17287
2019-06-29 22:56:21 +01:00
Andy Wilkinson 71b09e39ae Merge branch '2.1.x'
Closes gh-17370
2019-06-29 22:36:14 +01:00
Dmytro Nosan ae184874e9 Polish WebServiceTemplateBuilder
See gh-17289
2019-06-29 22:19:03 +01:00
Andy Wilkinson 4c812b065d Merge pull request #17322 from garyrussell
* gh-17322:
  Auto-configure KLC with user-provided RecordInterceptor

Closes gh-17322
2019-06-29 22:06:25 +01:00
Gary Russell eeda12bd58 Auto-configure KLC with user-provided RecordInterceptor
spring-kafka.2.3.0.M3 introduced a new property `RecordInterceptor` to
the container factory.

Auto-configure the property if a single instance is present.

See gh-17322
2019-06-29 22:05:33 +01:00
Andy Wilkinson 13bbfb7ede Polish "Polish TomcatReactiveWebServerFactoryTests"
See gh-17336
2019-06-29 21:57:55 +01:00
Johnny Lim 0e7824cec1 Polish TomcatReactiveWebServerFactoryTests
See gh-17336
2019-06-29 21:56:19 +01:00
Andy Wilkinson 9f521430fa Polish "Use @EmbeddedKafka for Integration Tests"
See gh-17355
2019-06-29 21:47:11 +01:00
Gary Russell 815834ab6e Use @EmbeddedKafka for Integration Tests
`@EmbeddedKafka` now supports JUnit 5 without the need for a Spring
test application context. Remove the previous workaround that replaced
the JUnit4 `@ClassRule` and use `TopicBuilder` to build the
topic bean.

See gh-17355
2019-06-29 21:36:36 +01:00
Andy Wilkinson 6212901bc1 Polish "Add 'client-name' property to specify a Redis client name"
See gh-17330
2019-06-29 21:24:57 +01:00
Dmytro Nosan f877caf118 Add 'client-name' property to specify a Redis client name
See gh-17330
2019-06-29 21:23:25 +01:00
Andy Wilkinson e496203740 Merge branch '2.1.x'
Closes gh-17368
2019-06-29 21:19:13 +01:00
Johnny Lim 408035fb3f Remove System.out.println() in a test
See gh-17358
2019-06-29 21:18:44 +01:00
Andy Wilkinson ea7443bf01 Merge branch '2.1.x'
Closes gh-17367
2019-06-29 21:15:29 +01:00
Johnny Lim 8dea74a2e9 Add a missing quote in DebugLogbackConfigurator
See gh-17357
2019-06-29 21:14:42 +01:00
Andy Wilkinson 8f668610f7 Align RSocket auto-configuration latest Framework changes
Closes gh-17366
2019-06-29 21:09:54 +01:00
Andy Wilkinson 1fa48882bb Merge branch '2.1.x'
See gh-17362
2019-06-29 20:39:19 +01:00
Andy Wilkinson f4e7b80651 Merge branch '2.0.x' into 2.1.x
See gh-17361
2019-06-29 20:38:18 +01:00
Andy Wilkinson 761856ac70 Merge branch '1.5.x' into 2.0.x 2019-06-29 20:29:16 +01:00
Phillip Webb 605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb a417e136a3 Merge branch '2.1.x' 2019-06-28 14:15:17 -07:00
Phillip Webb 9aa4887376 Merge branch '2.0.x' into 2.1.x 2019-06-28 14:14:52 -07:00
Phillip Webb ed3e1e076d Fix AbstractFilterRegistrationBean merge error
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb c62b6b4ccd Merge branch '2.1.x' 2019-06-28 12:22:45 -07:00
Phillip Webb de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Madhura Bhave 7e22901bb2 Fail build on unresolved documentation links
Closes gh-12005
2019-06-28 12:04:30 -07:00
rossdrew d6977ea89f Remove hyphenation of opaquetoken in OAuth2 property names
See gh-17290
2019-06-28 14:48:56 +01:00
Phillip Webb 8edf88a08b Polish M2Eclipse ignore configuration
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
2019-06-27 09:42:14 -07:00
Andy Wilkinson 66f1344f7c Merge branch '2.1.x'
Closes gh-17335
Closes gh-17292
2019-06-27 12:00:34 +01:00
Andy Wilkinson 91786bc712 Merge branch '2.0.x' into 2.1.x
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson 256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
HaiTao Zhang d9048d2531 Provide ability to add additional connectors on reactive Tomcat
See gh-17323
2019-06-26 15:36:12 -07:00
Andy Wilkinson 361a9404fd Merge branch '2.1.x'
Closes gh-17321
2019-06-26 17:40:44 +01:00
Andy Wilkinson 3fb06ee29e Merge branch '2.0.x' into 2.1.x
Closes gh-17320
2019-06-26 17:39:13 +01:00
Andy Wilkinson 4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Andy Wilkinson b67fedd749 Start building against Spring Kafka 2.3.0.M4 snapshots
See gh-17319
2019-06-26 16:55:48 +01:00
Madhura Bhave d5c0009c6e Rename samples to smoke tests
Closes gh-17197
2019-06-25 11:32:56 -07:00
Phillip Webb 0b720b99b2 Merge branch '2.1.x'
Closes gh-17308
2019-06-25 11:19:57 -07:00
Phillip Webb 02e705c8e4 Relax nohttp requirement for service.wsdl
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.

Fixes gh-17307
2019-06-25 11:17:27 -07:00
Brian Clozel 9166b6d329 Polish "Make rSocketServerBootstrap @ConditionalOnMissingBean"
See gh-17301
2019-06-25 11:25:11 +02:00
Spencer Gibb 2cb6af959b
Make rSocketServerBootstrap @ConditionalOnMissingBean
7857dd2d72 broke gateway's ability to override the `SocketAcceptor`.
2019-06-24 16:13:36 -04:00
Andy Wilkinson 7405efa326 Ensure that each Tomcat customizer is only called once
Fixes gh-17264
2019-06-21 17:53:24 +01:00
Stephane Nicoll e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
2019-06-21 18:09:05 +02:00
Stephane Nicoll 403d868611 Polish "Use constants for HTTP headers"
See gh-17199
2019-06-21 16:20:46 +02:00
Johnny Lim a57df0f595 Use constants for HTTP headers
See gh-17199
2019-06-21 15:58:34 +02:00
Stephane Nicoll 374e02cac8 Simplify HibernateJpaAutoConfiguration classes check
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.

Closes gh-17288
2019-06-21 15:26:07 +02:00
Stephane Nicoll 8a7609f940 Simplify HibernateJpaAutoConfiguration classes check
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.

Closes gh-17283
2019-06-21 15:22:28 +02:00
Brian Clozel 7857dd2d72 Update after RSocket changes in Spring Framework
Spring Framework recently removed the `MessageHandlerAcceptor` (which is
a sub-class of `RSocketMessageHandler`).
Instead of implementing directly the `SocketAcceptor` contract, it now
exposes them through `clientAcceptor()` and `serverAcceptor()` methods.

See gh-17280
2019-06-21 11:21:13 +02:00
Stephane Nicoll 62c70140c6 Upgrade to JUnit Jupiter 5.5.0-RC2
See gh-17266
2019-06-21 09:36:08 +02:00
Andy Wilkinson 0497936940 Start building against Spring Framework 5.2.0.RC1 snapshots
See gh-17280
2019-06-21 08:29:01 +01:00
Stephane Nicoll 9eb2650c0f Merge branch '2.1.x' 2019-06-21 09:09:49 +02:00
Stephane Nicoll 86ace26049 Fix broken link to Spring Integration reference guide
Closes gh-17279
2019-06-21 09:09:01 +02:00
Andy Wilkinson 6d8ba654cc Merge branch '2.1.x'
Closes gh-17276
2019-06-20 11:17:37 +01:00
Andy Wilkinson a5ae1de706 Fix spring-boot-loader's tests on Windows
Closes gh-17275
2019-06-20 11:08:35 +01:00
Johnny Lim f283aa18eb Use "JUnit" instead of "Junit"
See gh-17272
2019-06-20 08:45:03 +02:00
Stephane Nicoll ea9a0c7839 Fix @RegisterExtension on CliTester
This reverts commit dfa5480c and rather make the field package private
so that the extension can be registered properly

Closes gh-17266
2019-06-19 20:44:52 +02:00
Stephane Nicoll dfa5480c59 Remove useless @RegisterExtension on CliTester
Closes gh-17266
2019-06-19 16:05:16 +02:00
Stephane Nicoll 45d2f1d7d1 Merge branch '2.1.x'
Closes gh-17269
2019-06-19 15:31:50 +02:00
Stephane Nicoll 7e5ca6d280 Merge branch '2.0.x' into 2.1.x
Closes gh-17268
2019-06-19 15:30:13 +02:00
Stephane Nicoll 11dee3c0d8 Merge branch '1.5.x' into 2.0.x 2019-06-19 15:27:49 +02:00
Stephane Nicoll c9b8d98bcf Upgrade to JUnit Jupiter 5.5.0-RC1
This commit also removes the workaround that required to exclude junit 4
explicitly now that a related issue in JUnit Jupiter has been fixed.

Closes gh-17266
2019-06-19 14:23:44 +02:00
Phillip Webb 59ca46ed54 Remove FIXME 2019-06-18 21:41:05 -07:00
Brian Clozel 809a3965c9 Add missing outcome tag for WebClient metrics
On error cases, the "outcome" tag would be missing from recorded metrics
for the `WebClient`.

This commit fixes this issue and improves the reference documentation by
mentioning the tag values used for error cases, when the client response
is not received (I/O errors, client error, etc).

Fixes gh-17219
2019-06-18 15:29:22 +02:00
Phillip Webb 82949b9cc4 Upgrade to Mariadb 2.4.2
Closes gh-17237
2019-06-17 20:56:14 -07:00
Phillip Webb 1e0cf960f0 Reinstate single page HTML and PDF docs
Closes gh-16854
2019-06-17 20:44:01 -07:00
Phillip Webb e44caec60b Merge branch '2.1.x'
Closes gh-17236
2019-06-17 19:51:51 -07:00
Phillip Webb 3eb7af1506 Upgrade to Infinispan 9.4.15.Final
Closes gh-17235
2019-06-17 19:42:33 -07:00
Phillip Webb 2c2b962204 Merge branch '2.1.x'
Closes gh-17232
2019-06-17 15:54:51 -07:00
Phillip Webb d82ccf1405 Ensure META-INF/MANIFEST.MF remains as first entry
Update Gradle archive tasks to ensure that `META-INF/` and
`META-INF/MANIFEST.MF` remain as the first entries of the archive.

Prior to this commit, rewritten archives would violate the implicit
specification of `JarInputStream` that these entries should be first.

Fixes gh-16698
2019-06-17 15:48:14 -07:00
Phillip Webb f4d9e1c650 Fix checkstyle violation 2019-06-17 14:45:17 -07:00
Phillip Webb 69fbd8f20c Merge branch '2.1.x'
Closes gh-17227
Closes gh-17228
2019-06-17 11:53:16 -07:00
Phillip Webb 692bda1595 Polish "Fix connection timeout configuration for Netty"
See gh-16535
2019-06-17 11:26:36 -07:00
ayudovin b0e4c716d3 Fix connection timeout configuration for Netty
Update `NettyWebServerFactoryCustomizer` to deal with the fact that
Netty treats `0` and negative connection timeout values differently to
Tomcat, Undertow and Jetty.

See gh-16535
2019-06-17 11:24:35 -07:00
ayudovin c2d1cb2c70 Chain predicates in PropertyMapper when methods
Update `PropertyMapper` to correctly combine predicates when repeated
calls are made to `when` and `whenNot`. Prior to this commit, subsequent
invocations would replace the previous predicate.

Fixes gh-17225
2019-06-17 11:21:56 -07:00
Andy Wilkinson bd14050859 Merge branch '2.1.x'
Closes gh-17224
2019-06-17 16:16:41 +01:00
Andy Wilkinson 88fbc529e6 Upgrade to Micrometer 1.1.5
Closes gh-17222
2019-06-17 16:15:44 +01:00
Andy Wilkinson f07f030ba9 Merge branch '2.1.x'
Closes gh-17223
2019-06-17 16:08:42 +01:00
Andy Wilkinson fe9db792ee Complete dependency management for JavaBeans Activation Framework
Fixes gh-17062
2019-06-17 16:00:39 +01:00
Andy Wilkinson a189e4cf96 Merge branch '2.1.x'
Closes gh-17220
2019-06-17 14:05:16 +01:00
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
See gh-16485
2019-06-17 13:54:41 +01:00
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest
See gh-16485
2019-06-17 13:37:55 +01:00
Andy Wilkinson 9d355f00e1 Merge branch '2.1.x'
Closes gh-17218
2019-06-17 13:19:45 +01:00
Andy Wilkinson 5dc2339ec2 Polish "Consider properties from @AutoConfigureTestDatabase"
See gh-16814
2019-06-17 11:38:13 +01:00
András Deák 92256c80d0 Consider properties from @AutoConfigureTestDatabase
Both Flyway and Liquibase makes use of DataSourceProperties to get
default properties. Previously, both used strictly the configuration
properties and failed to consider embedded datasource properties
autoconfigured by @AutoConfigureTestDatabase. In case a database layer
test e.g. @JdbcTest relies on the autoconfigured embedded datasource,
Flyway and Liquibase autoconfiguration fails as they are not aware of
the embedded datasource properties.

See gh-16814
2019-06-17 11:09:29 +01:00
Andy Wilkinson f36af7b16d Polish 2019-06-17 11:02:54 +01:00
Andy Wilkinson 78f51a490c Merge branch '2.1.x'
Closes gh-17213
2019-06-17 10:59:16 +01:00
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests"
See gh-17066
2019-06-17 10:55:35 +01:00
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests
See gh-17066
2019-06-17 10:55:35 +01:00
Andy Wilkinson c62543b514 Merge branch '2.1.x'
Closes gh-17212
2019-06-17 10:47:22 +01:00
Andy Wilkinson 13a7a52c71 Revert "Work around Framework regression in handling of null model values"
This reverts commit 5fc67c545c.

Closes gh-16991
2019-06-17 10:44:23 +01:00
Andy Wilkinson ece8703278 Merge branch '2.1.x'
Closes gh-17211
2019-06-17 10:36:46 +01:00
Andy Wilkinson 7d59b78829 Fix handling of jar files with + chars in their path
Closes gh-17208
2019-06-17 10:31:51 +01:00
Johnny Lim 368c0eebe4 Fix typo
See gh-17132
2019-06-16 11:42:00 +02:00
Andy Wilkinson 801ce6d0a1 Upgrade to Spring Session Corn-M2
Closes gh-16587
2019-06-16 08:48:57 +01:00
Andy Wilkinson 84c6313332 Upgrade to Spring Session Bom Bean-SR6
Closes gh-17209
2019-06-16 08:47:40 +01:00
Andy Wilkinson fa99bd1d89 Upgrade to Spring Integration 5.2.0.M3
Closes gh-17201
2019-06-15 10:44:09 +01:00
Andy Wilkinson fa8dc04751 Upgrade to Spring Kafka 2.2.7.RELEASE
Closes gh-17206
2019-06-15 10:42:14 +01:00
Andy Wilkinson e842dc7f0c Upgrade to Spring Integration 5.1.6.RELEASE
Closes gh-17205
2019-06-15 10:42:14 +01:00
Andy Wilkinson 88df70c4d0 Upgrade to Spring Amqp 2.1.7.RELEASE
Closes gh-17204
2019-06-15 10:42:14 +01:00
Andy Wilkinson d1dc457a87 Upgrade to Spring AMQP 2.2.0.M3
Closes gh-17203
2019-06-15 10:36:13 +01:00
Andy Wilkinson c059c02dca Upgrade to Spring Kafka 2.3.0.M3
Closes gh-17202
2019-06-15 10:35:41 +01:00
Andy Wilkinson 9fda7add5c Upgrade to Spring Security 5.2.0.M3
Closes gh-16965
2019-06-15 10:35:01 +01:00
Phillip Webb 25839185c1 Fix checkstyle violation 2019-06-14 18:57:41 -07:00
Phillip Webb 0b3015e4ff Polish Binder classes
Polish and rename some of the internal Binder classes to better reflect
their purpose. The `BeanBinder` is now called `DataObjectBinder` and
as a `JavaBeanBinder` implementation for setter based properties, and
a `ValueObjectBinder` implementation for constructor based properties.
2019-06-14 18:14:40 -07:00
Madhura Bhave c6dae5764e Add bindOrCreate for constructor based binding
Deprecate the existing `BindResult.orElseCreate` method in favor of
`bindOrCreate` methods on the `Binder`. These new methods allow us to
implement custom creation logic depending on the type of object being
bound. Specifically, it allows constructor based binding to create new
instances that respect the `@DefaultValue` annotations.

Closes gh-17098

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2019-06-14 18:14:40 -07:00
Andy Wilkinson 38fb639147 Merge branch '2.1.x'
Closes gh-17196
2019-06-14 15:49:00 +01:00
Andy Wilkinson 1b495f5a42 Merge branch '2.0.x' into 2.1.x
Closes gh-17195
2019-06-14 15:47:39 +01:00
Andy Wilkinson 4bae91d933 Merge branch '1.5.x' into 2.0.x 2019-06-14 15:47:22 +01:00
Andy Wilkinson 887e39f2fe Update to Spring HATEOAS 1.0.0.M3
Closes gh-17075
2019-06-14 15:28:48 +01:00
Andy Wilkinson 96ac42e405 Upgrade to Spring Data Lovelace-SR9
Closes gh-17193
2019-06-14 15:24:32 +01:00
Andy Wilkinson 8bfe2fa9c9 Update to Spring Data Moore-RC1
Closes gh-16966
2019-06-14 15:21:12 +01:00
Andy Wilkinson 75da4468e5 Merge branch '2.1.x'
Closes gh-17192
2019-06-14 15:15:19 +01:00
Andy Wilkinson d5d96dff96 Honor logback.debug property and write Logback statuses to console
Closes gh-16876
2019-06-14 15:12:05 +01:00
Andy Wilkinson 48adfe626c Log H2 console path and JDBC URL on startup
Closes gh-17063
2019-06-14 13:42:01 +01:00
Andy Wilkinson 24bda8609b Upgrade to Maven War Plugin 3.2.3
Closes gh-17190
2019-06-14 12:20:05 +01:00
Andy Wilkinson e30e1aa60b Upgrade to Mockito 2.28.2
Closes gh-17189
2019-06-14 12:20:05 +01:00
Andy Wilkinson f5a675157d Upgrade to Infinispan 9.4.14.Final
Closes gh-17188
2019-06-14 12:20:05 +01:00
Andy Wilkinson 8506d4247b Upgrade to Hsqldb 2.5.0
Closes gh-17187
2019-06-14 12:20:05 +01:00
Andy Wilkinson 85c1b7e9dc Upgrade to Hibernate Validator 6.0.17.Final
Closes gh-17186
2019-06-14 12:20:05 +01:00
Andy Wilkinson 908aca6b06 Upgrade to Hibernate 5.4.3.Final
Closes gh-17185
2019-06-14 12:20:05 +01:00
Andy Wilkinson c9f0fe3c33 Upgrade to Jaybird 3.0.6
Closes gh-17184
2019-06-14 12:20:05 +01:00
Andy Wilkinson ff1a8e7222 Upgrade to Jetty 9.4.19.v20190610
Closes gh-17183
2019-06-14 12:20:05 +01:00
Andy Wilkinson a2baf33e28 Upgrade to Tomcat 9.0.21
Closes gh-17182
2019-06-14 12:17:59 +01:00
Andy Wilkinson 8caa25e379 Upgrade to Kafka 2.2.1
Closes gh-17181
2019-06-14 12:17:58 +01:00
Andy Wilkinson 0430b35325 Upgrade to Johnzon Jsonb 1.1.12
Closes gh-17180
2019-06-14 12:17:57 +01:00
Andy Wilkinson 4d0c08c4b7 Upgrade to Httpclient 4.5.9
Closes gh-17179
2019-06-14 12:17:56 +01:00
Andy Wilkinson 336563dff5 Upgrade to Artemis 2.9.0
Closes gh-17178
2019-06-14 12:17:55 +01:00
Andy Wilkinson 318bfbf139 Upgrade to Byte Buddy 1.9.13
Closes gh-17177
2019-06-14 12:17:54 +01:00
Andy Wilkinson ff6f616d31 Upgrade to Undertow 2.0.21.Final
Closes gh-17176
2019-06-14 12:17:53 +01:00
Andy Wilkinson e2c5af526f Upgrade to Rxjava2 2.2.9
Closes gh-17175
2019-06-14 12:17:52 +01:00
Andy Wilkinson a269752f56 Upgrade to Lettuce 5.1.7.RELEASE
Closes gh-17174
2019-06-14 12:17:50 +01:00
Andy Wilkinson 7872e6231c Upgrade to Unboundid Ldapsdk 4.0.11
Closes gh-17173
2019-06-14 12:17:49 +01:00
Andy Wilkinson 11641714a6 Upgrade to Rabbit Amqp Client 5.7.1
Closes gh-17172
2019-06-14 12:17:48 +01:00
Andy Wilkinson f8c87e7da7 Upgrade to Hazelcast 3.12.1
Closes gh-17171
2019-06-14 12:17:46 +01:00
Andy Wilkinson daedb5d379 Upgrade to Appengine Sdk 1.9.75
Closes gh-17170
2019-06-14 12:17:45 +01:00
Andy Wilkinson 1950016b45 Upgrade to Couchbase Client 2.7.7
Closes gh-17169
2019-06-14 12:17:43 +01:00
Andy Wilkinson 1aa193e30b Upgrade to Maven War Plugin 3.2.3
Closes gh-17168
2019-06-14 12:13:55 +01:00
Andy Wilkinson a3bc383019 Upgrade to Neo4j Ogm 3.1.11
Closes gh-17167
2019-06-14 12:13:55 +01:00
Andy Wilkinson 491f5f3233 Upgrade to Infinispan 9.4.14.Final
Closes gh-17166
2019-06-14 12:13:55 +01:00
Andy Wilkinson 53c0860151 Upgrade to Hibernate Validator 6.0.17.Final
Closes gh-17165
2019-06-14 12:13:55 +01:00
Andy Wilkinson bc713a6825 Upgrade to Jaybird 3.0.6
Closes gh-17164
2019-06-14 12:13:54 +01:00
Andy Wilkinson 8b44d07944 Upgrade to Jetty 9.4.19.v20190610
Closes gh-17163
2019-06-14 12:13:54 +01:00
Andy Wilkinson 24242ec476 Upgrade to Tomcat 9.0.21
Closes gh-17162
2019-06-14 12:09:44 +01:00
Andy Wilkinson 9a54ec2346 Upgrade to Solr 7.7.2
Closes gh-17161
2019-06-14 12:09:43 +01:00
Andy Wilkinson 34b55818d8 Upgrade to Johnzon Jsonb 1.1.12
Closes gh-17160
2019-06-14 12:09:42 +01:00
Andy Wilkinson 632d2665e8 Upgrade to Httpclient 4.5.9
Closes gh-17159
2019-06-14 12:09:40 +01:00
Andy Wilkinson eec7cbb7e3 Upgrade to Byte Buddy 1.9.13
Closes gh-17158
2019-06-14 12:09:40 +01:00
Andy Wilkinson 9bcf7a2cfd Upgrade to Undertow 2.0.21.Final
Closes gh-17157
2019-06-14 12:09:38 +01:00
Andy Wilkinson 48631c75d8 Upgrade to Rxjava2 2.2.9
Closes gh-17156
2019-06-14 12:09:37 +01:00
Andy Wilkinson 93dc36655a Upgrade to Lettuce 5.1.7.RELEASE
Closes gh-17155
2019-06-14 12:09:36 +01:00