6009 Commits

Author SHA1 Message Date
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