6201 Commits

Author SHA1 Message Date
Stephane Nicoll
19eaf86efa Update multi release test jar to include Java 12
See gh-16970
2019-07-24 08:06:22 +02:00
Andy Wilkinson
e7b94be9cd Polish "Document @EmbeddedKafka and its interaction with Spring Boot"
See gh-15834
2019-07-23 17:20:46 +01:00
Artem Bilan
4e79408bb0 Document @EmbeddedKafka and its interaction with Spring Boot
See gh-15834
2019-07-23 16:59:04 +01:00
Phillip Webb
6c0dbacfce Polish 2019-07-23 15:43:51 +01:00
Phillip Webb
0d92af7d55 Add hasJsonPath and doesNotHaveJsonPath asserts
Extend `JsonContentAssert` with `hasJsonPath` and `doesNotHaveJsonPath`
methods which can be used to check the path regardless of the value it
may or may not contain.

Prior to this commit there wasn't an easy way to assert that the
Jackson `@JsonInclude(JsonInclude.Include.NON_NULL)` annotation was
applied since `assertDoesNotHavePathValue` would pass for both
`{"name" : null}` and `{}`.

Closes gh-17608
2019-07-23 15:43:51 +01:00
Phillip Webb
900ec9f3ec Fix error message formatting placeholders
Fix the formatting message placeholders to '%s' since '{}' isn't
supported by AssertJ.

See gh-15569
2019-07-23 15:43:51 +01:00
Stephane Nicoll
690019ba8f Polish "Disable tests that are failing on Java 13"
See gh-17607
2019-07-23 15:51:21 +02:00
Stephane Nicoll
5f3fff6470 Disable tests that are failing on Java 13
Hazelcast YAML support does not work with Java 13 so this commit
disables relevant tests when Java 13 is detected

See https://github.com/hazelcast/hazelcast/issues/15348

See gh-17607
2019-07-23 12:41:24 +02:00
Stephane Nicoll
94c35ae1de Polish "Make Actuator dedicated ConversionService configurable"
See gh-16449
2019-07-23 12:27:00 +02:00
chao.chang
2aea437536 Make Actuator dedicated ConversionService configurable
See gh-16449
2019-07-23 11:16:27 +02:00
Stephane Nicoll
38a42a8600 Improve NoSuchMethodError message parsing
Closes gh-17544
2019-07-23 10:42:33 +02:00
Stephane Nicoll
26ee9150b2 Document WebFilter is scanned by @WebFluxTest
See gh-17601
2019-07-23 09:01:32 +02:00
Stephane Nicoll
94a757113d Document HandlerInterceptor is scanned by @WebMvcTest
See gh-17601
2019-07-23 08:57:09 +02:00
Dmytro Nosan
9d052bbe5e Include WebFilter beans in WebFluxTest slice
See gh-17601
2019-07-22 12:38:48 -07:00
Dmytro Nosan
6859a89cf3 Include HandlerInterceptor beans in WebMvcTest slice
See gh-17600
2019-07-22 12:34:11 -07:00
Brian Clozel
53afbbe233 Update RouteMatcher configuration for RSocket
This commit updates the `RouteMatcher` configuration after the latest
Spring Framework changes. The default route matcher implementation based
on the `PathPattern` infrastructure is now tailored for the messaging
use case (path separator, path encoding options and trailing separator).

See spring-projects/spring-framework#23310
2019-07-22 15:30:40 +02:00
Stephane Nicoll
a1f32bbd7a Merge branch '2.1.x'
Closes gh-17603
2019-07-22 15:29:58 +02:00
Stephane Nicoll
30fe10613d Improve how to configure configuration keys of a custom starter
Closes gh-17573
2019-07-22 15:28:17 +02:00
Stephane Nicoll
300f07b2a8 Polish 2019-07-22 15:20:37 +02:00
Stephane Nicoll
3c7ac4fe7f Polish 2019-07-22 13:17:51 +02:00
Stephane Nicoll
55079c3a80 Merge branch '2.1.x'
Closes gh-17602
2019-07-22 13:16:58 +02:00
Stephane Nicoll
1661da8774 Polish "Configure ActiveMQConnectionFactory properly without spring-jms"
See gh-17531
2019-07-22 13:09:31 +02:00
Dmytro Nosan
77b52b993b Configure ActiveMQConnectionFactory properly without spring-jms
See gh-17531
2019-07-22 13:08:42 +02:00
Stephane Nicoll
0ff4484568 Merge branch '2.1.x'
Closes gh-17599
2019-07-22 10:27:04 +02:00
dreis2211
c2b6939ae1 Cover more known Java versions in JavaVersion
See gh-17590
2019-07-22 10:24:54 +02:00
Remko Popma
e69854fc30 Add reference to picocli starter
See gh-17591
2019-07-22 09:53:18 +02:00
adavid9
6211a682d6 Replace deprecated media type
See gh-17596
2019-07-21 18:28:10 +02:00
Johnny Lim
8f8b0b493e Remove println invocations in tests
See gh-17592
2019-07-21 18:26:26 +02:00
Phillip Webb
ca5df3cc9c Cache TypeExcludeFilter delegates
Cache TypeExcludeFilter delegates to save repeated calls to
`beanFactory.getBeansOfType`.

Closes gh-17595
2019-07-20 13:56:42 +01:00
Phillip Webb
ff9f5fd1c7 Polish OnBeanCondition
Polish `OnBeanCondition` and make it easier to remove `BeanTypeRegistry`
in the future.

See gh-17594
2019-07-20 13:36:56 +01:00
Andy Wilkinson
ff9d0cf49b Merge branch '2.1.x'
Closes gh-17588
2019-07-19 15:44:19 +01:00
Andy Wilkinson
74f0e42c98 Make it clearer when there will be no auto-configured MessageSource
Closes gh-17485
2019-07-19 15:44:00 +01:00
Andy Wilkinson
78871d7a5d Tighten up sourceDocumentExtensions used for single and multi-page docs
Previously, the sourceDocumentExtension used for the single-page
documentation was htmlsingleadoc and for the multi-page docs they
were adoc and htmladoc. When finding source files to render, the
Asciidoctor Maven Plugin looks for files with a name that ends with
one of the configured extensions. This resulted in the
index.htmlsingleadoc file matching the adoc extention in the
multi-page configuration in addition to the intended match for the
index.htmladoc. As a result both the single-page and multi-page
indexes were rendered when rendering the multi-page documentation.

In addition to this unwanted rendering, if the single-page index was
rendered after the multi-page index, the multi-page index would be
overwritten by the single-page index, leaving the multi-page docs with
the wrong index file. Asciidoctor uses File.listFiles() during its
source file discovery which is documented as having no guarantee
that the resulting array will be in any specific order. As a result,
there was also no guarantee about which index we'd end up with.

Closes gh-17263
2019-07-19 14:55:10 +01:00
Andy Wilkinson
ea1dc85d50 Isolate Jackson2ObjectMapperBuilder mutation
Previously, Jackson2ObjectMapperBuilder was a singleton bean. This
meant that if it was injected and mutated in one injection point,
usage in a subsequent injection point would see the previous
injection point's mutation which can lead to unexpected failures.

This commit updates the auto-configuration of the builder to make it
a protoype bean. Mutation of the builder that is intended to apply
globally should be made using a customizer.

Closes gh-17477
2019-07-19 13:57:55 +01:00
Andy Wilkinson
c7d2799f4e Add configuration property for DispatcherServlet event publishing
Closes gh-17500
2019-07-19 13:11:19 +01:00
Stephane Nicoll
3dd5426ea5 Polish "Adjust to changes in Spring AMQP 2.2 snapshots"
See gh-17587
2019-07-19 13:20:25 +02:00
dreis2211
e71a417399 Adjust to changes in Spring AMQP 2.2 snapshots
See gh-17587
2019-07-19 13:19:57 +02:00
Stephane Nicoll
e5ca9df478 Merge branch '2.1.x' 2019-07-19 11:33:16 +02:00
Stephane Nicoll
8eb6886388 Fix code formating 2019-07-19 11:29:12 +02:00
Stephane Nicoll
cc5df880c7 Start building against Spring Integration 5.2 snapshots
See gh-17584
2019-07-19 11:26:43 +02:00
Stephane Nicoll
a88e231c75 Start building against Spring AMQP 2.2 snapshots
See gh-17583
2019-07-19 11:26:43 +02:00
Stephane Nicoll
e6a5895c05 Start build against Spring Session Bean snapshots
See gh-17581
2019-07-19 11:13:43 +02:00
Stephane Nicoll
32e00d5dd2 Start building against Spring Data Lovelace snapshots
See gh-17353
2019-07-19 11:11:42 +02:00
Stephane Nicoll
1d4e9cb6a4 Start building against Spring Framework 5.1 snapshots
See gh-17351
2019-07-19 11:10:58 +02:00
Andy Wilkinson
3dc20ff934 Recommend third-party tracing/observability solutions
Closes gh-17047
2019-07-19 10:04:27 +01:00
Stephane Nicoll
08afbe286c Merge branch '2.1.x'
Closes gh-17580
2019-07-19 10:35:01 +02:00
Stephane Nicoll
b8d92cb0ae Fix @DataJdbcTest to be transactional as advertized
Closes gh-17513
2019-07-19 10:33:59 +02:00
Stephane Nicoll
5903e9a57a Polish 2019-07-19 10:33:52 +02:00
Andy Wilkinson
741d8735d2 Merge branch '2.1.x'
Closes gh-17576
2019-07-18 17:57:07 +01:00
dreis2211
43833c7bf0 Remove unused java-statsd-client dependencies
See gh-17508
2019-07-18 17:54:48 +01:00