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

5649 Commits

Author SHA1 Message Date
Stephane Nicoll 6544d19fbf Merge branch '2.1.x' 2019-05-13 11:15:57 +02:00
Stephane Nicoll 4c1ef630c9 Restore lazy evaluation of project/build/finalName 
This commit restores the read-only `finalName` so that its value can
be lazily resolved against `${project.build.finalName}`.

While doing the evaluation ourselves and not relying on a dedicated
field at all would have been better, the evaluation increased the
number of required dependencies for no good reason.

IDEs should not offer auto-completion for that read-only field and it
is not published in the generated site either.

Closes gh-16456
 2019-05-13 11:14:21 +02:00
Brian Clozel 9f2995af6f Migrate from deprecated Jetty's SslContextFactory 
Closes gh-16827
 2019-05-13 10:27:20 +02:00
Brian Clozel 2e504b4c3c Migrate from NCSARequestLog to CustomRequestLog 
Closes gh-16416
 2019-05-13 09:35:49 +02:00
Madhura Bhave f1786c357b Revert "Disable ConfigurationProperties scanning for slice tests" 
This reverts commit 3b4ff7d746.
The commit caused the build to fail because it disabled
`@ConfigurationPropertiesScan` completely in slice tests. It
did not take into account components that were explicitly included
in slice tests using the `components` attribute. Since `@ConfigurationPropertiesScan`
replaces `@Component` and `@EnableConfigurationProperties`, these components
are no longer registered even though explicitly included.
 2019-05-11 09:59:36 -07:00
Madhura Bhave 3b4ff7d746 Disable ConfigurationProperties scanning for slice tests 
Closes gh-16659
 2019-05-10 14:43:55 -07:00
Brian Clozel 930186e505 Merge branch '2.1.x' 2019-05-10 23:20:36 +02:00
Marcus Eisele 94a9748ce0 Fix 'spring.resources.cache.period' for WebMvc 
Before this change it got overwritten by forwarding an empty
CacheControl to Spring. Spring itself sets CacheSeconds already
correctly in absence (=null) of a CacheControl.

Also:
* Fixes bug in WebMvcAutoConfigurationTests.cachePeriod which
prevented it to assert anything

See gh-16488
Closes gh-16730
 2019-05-10 23:18:54 +02:00
Brian Clozel 0b4934d140 Fix DefaultErrorWebExceptionHandler test 2019-05-10 17:43:45 +02:00
Stephane Nicoll c4024d8b45 Upgrade to Spring Data Lovelace-SR7 
Closes gh-16724
 2019-05-10 17:04:11 +02:00
Brian Clozel d9ac3031c5 Remove Synchronoss nio-multipart from WebFlux starter 
Closes gh-16817
 2019-05-10 16:04:00 +02:00
Andy Wilkinson 552345fcd1 Disable more @Bean method proxying 
Previously, due to a quirk in Spring Framework, it was necessary to use bean method
proxying in @Configuration classes that define one or more FactoryBeans. This quirk has
now been addressed so this commit disables bean method proxying where it is now no longer
needed.

Closes gh-16533
 2019-05-10 10:16:22 +01:00
Stephane Nicoll c85c653e57 Polish "Add negative tests to ConfigurationPropertiesScanTests" 
Closes gh-16758
 2019-05-10 10:22:34 +02:00
Johnny Lim d44ffd3534 Add negative tests to ConfigurationPropertiesScanTests 
See gh-16758
 2019-05-10 10:22:08 +02:00
Stephane Nicoll 75eb0ef91d Upgrade to Mongodb 3.11.0-beta2 
Closes gh-16798
 2019-05-09 18:43:56 +02:00
Stephane Nicoll c4ecefe090 Upgrade to Spring Framework 5.2.0.M2 
Closes gh-16589
 2019-05-09 18:43:04 +02:00
Stephane Nicoll 6f70ad9c1c Upgrade to Spring Framework 5.1.7 
Closes gh-16812
 2019-05-09 18:14:29 +02:00
Gary Russell ef39ff8988 Start building against Spring Kafka 2.3.0.M2 snapshots 
See gh-16739
See gh-16752
 2019-05-09 15:53:34 +01:00
Andy Wilkinson 5514192672 Merge branch '2.1.x' 
Closes gh-16809
 2019-05-09 15:41:48 +01:00
Andy Wilkinson 96f3a482f0 Polish "Enable minIdle by allowing timeBetweenEviction runs to be configured" 
See gh-16703
 2019-05-09 15:40:11 +01:00
Gemini Kim 1659d46028 Enable minIdle by allowing timeBetweenEviction runs to be configured 
See gh-16703
 2019-05-09 15:40:11 +01:00
Andy Wilkinson bf294a762a Polish 2019-05-09 15:13:26 +01:00
Johnny Lim a56867da27 Consistent use of PropertyMapper::asInt 
See gh-16738
 2019-05-09 15:02:07 +01:00
Johnny Lim 1548fb655c Polish FlywayProperties 
See gh-16737
 2019-05-09 14:41:26 +01:00
Andy Wilkinson ece87cc4cc Polish "Provide control over how a Cassandra Cluster is created" 
See gh-16702
 2019-05-09 14:33:12 +01:00
Steffen Folman Qvistgaard 5daf310bf4 Provide control over how a Cassandra Cluster is created 
See gh-16702
 2019-05-09 14:33:11 +01:00
Stephane Nicoll 81af0f2fa6 Explicitly include JUnit 4 in test starter 
Closes gh-16807
 2019-05-09 14:54:13 +02:00
Andy Wilkinson ef11af8676 Polish "Remove unnecessary latches in tests" 
Closes gh-16733
 2019-05-09 12:12:23 +01:00
Johnny Lim 0baceb4aa4 Remove unnecessary latches in tests 
See gh-16733
 2019-05-09 12:09:54 +01:00
Johnny Lim 7c8bf48ebb Polish DevToolsEnablementDeducer and OnEnabledDevToolsCondition 
See gh-16732
 2019-05-09 12:01:33 +01:00
Andy Wilkinson ca51609cdf Align mock with Selenium HtmlUnit's new behaviour 
See gh-16801
 2019-05-09 09:48:36 +01:00
Stephane Nicoll 73764451eb Upgrade to Maven Help Plugin 3.2.0 
Closes gh-16804
 2019-05-09 09:51:48 +02:00
Stephane Nicoll 42e527d12b Upgrade to Maven Failsafe Plugin 2.22.2 
Closes gh-16803
 2019-05-09 09:51:47 +02:00
Stephane Nicoll c8731cfa7a Upgrade to Maven Compiler Plugin 3.8.1 
Closes gh-16802
 2019-05-09 09:51:46 +02:00
Stephane Nicoll 78e7dfe1a7 Upgrade to Selenium Htmlunit 2.35.1 
Closes gh-16801
 2019-05-09 09:51:45 +02:00
Stephane Nicoll a939687842 Upgrade to Lombok 1.18.8 
Closes gh-16800
 2019-05-09 09:51:44 +02:00
Stephane Nicoll 74be154932 Upgrade to Jetty El 8.5.40 
Closes gh-16799
 2019-05-09 09:51:43 +02:00
Stephane Nicoll 74baf35138 Upgrade to Mongodb 3.11.0-beta3 
Closes gh-16798
 2019-05-09 09:51:42 +02:00
Stephane Nicoll ba1951c1b5 Upgrade to Mockito 2.27.0 
Closes gh-16797
 2019-05-09 09:51:41 +02:00
Stephane Nicoll 387bdc572e Upgrade to Jolokia 1.6.1 
Closes gh-16796
 2019-05-09 09:51:39 +02:00
Stephane Nicoll adbfaf0b92 Upgrade to Kotlin 1.3.31 
Closes gh-16795
 2019-05-09 09:51:38 +02:00
Stephane Nicoll f48b4af180 Upgrade to Infinispan 9.4.13.Final 
Closes gh-16794
 2019-05-09 09:51:37 +02:00
Stephane Nicoll 928f406c6b Upgrade to Elasticsearch 6.7.2 
Closes gh-16793
 2019-05-09 09:51:36 +02:00
Stephane Nicoll 07c702e406 Upgrade to Ehcache3 3.7.1 
Closes gh-16792
 2019-05-09 09:51:35 +02:00
Stephane Nicoll a456b6e861 Upgrade to Jetty 9.4.18.v20190429 
Closes gh-16791
 2019-05-09 09:51:33 +02:00
Stephane Nicoll 6784831488 Upgrade to Commons Pool2 2.6.2 
Closes gh-16790
 2019-05-09 09:51:32 +02:00
Stephane Nicoll 6586db3509 Upgrade to Commons Lang3 3.9 
Closes gh-16789
 2019-05-09 09:51:31 +02:00
Stephane Nicoll 80c073b884 Upgrade to Artemis 2.8.0 
Closes gh-16788
 2019-05-09 09:51:30 +02:00
Stephane Nicoll b6001f8ec2 Upgrade to Htmlunit 2.35.0 
Closes gh-16787
 2019-05-09 09:51:28 +02:00
Stephane Nicoll 826610b760 Upgrade to Mysql 8.0.16 
Closes gh-16786
 2019-05-09 09:51:28 +02:00
Stephane Nicoll 9f769dd561 Upgrade to Jaxen 1.2.0 
Closes gh-16785
 2019-05-09 09:51:26 +02:00
Stephane Nicoll 636a7f64db Upgrade to Rsocket 0.12.2-RC2 
Closes gh-16784
 2019-05-09 09:51:25 +02:00
Stephane Nicoll 5626f57936 Upgrade to Netty Tcnative 2.0.25.Final 
Closes gh-16783
 2019-05-09 09:51:24 +02:00
Stephane Nicoll a2d1debbad Upgrade to Netty 4.1.36.Final 
Closes gh-16782
 2019-05-09 09:51:23 +02:00
Stephane Nicoll a407434e8a Upgrade to Appengine Sdk 1.9.74 
Closes gh-16781
 2019-05-09 09:51:22 +02:00
Stephane Nicoll 7c92af003c Upgrade to Reactor Californium-SR8 
Closes gh-16723
 2019-05-09 09:10:48 +02:00
Stephane Nicoll c7141fbe9e Upgrade to Maven Failsafe Plugin 2.22.2 
Closes gh-16780
 2019-05-09 09:10:27 +02:00
Stephane Nicoll 3f82b3327c Upgrade to Maven Compiler Plugin 3.8.1 
Closes gh-16779
 2019-05-09 09:10:26 +02:00
Stephane Nicoll b1f6a021ef Upgrade to Lombok 1.18.8 
Closes gh-16778
 2019-05-09 09:10:25 +02:00
Stephane Nicoll f2ea63d613 Upgrade to Neo4j Ogm 3.1.9 
Closes gh-16777
 2019-05-09 09:10:24 +02:00
Stephane Nicoll 73007757ec Upgrade to Jetty El 8.5.40 
Closes gh-16776
 2019-05-09 09:10:23 +02:00
Stephane Nicoll 9629671a0a Upgrade to Jooq 3.11.11 
Closes gh-16775
 2019-05-09 09:10:22 +02:00
Stephane Nicoll 6aeba7fcde Upgrade to Jolokia 1.6.1 
Closes gh-16774
 2019-05-09 09:10:20 +02:00
Stephane Nicoll 4c92d88e60 Upgrade to Infinispan 9.4.13.Final 
Closes gh-16773
 2019-05-09 09:10:19 +02:00
Stephane Nicoll 25cb7ce814 Upgrade to Hibernate 5.3.10.Final 
Closes gh-16772
 2019-05-09 09:10:17 +02:00
Stephane Nicoll a187376d54 Upgrade to Jetty 9.4.18.v20190429 
Closes gh-16771
 2019-05-09 09:10:16 +02:00
Stephane Nicoll 136ca881cb Upgrade to Aspectj 1.9.3 
Closes gh-16770
 2019-05-09 09:10:15 +02:00
Stephane Nicoll 3a5b5d13ff Upgrade to Commons Pool2 2.6.2 
Closes gh-16769
 2019-05-09 09:10:14 +02:00
Stephane Nicoll 81c2b1380b Upgrade to Mysql 8.0.16 
Closes gh-16768
 2019-05-09 09:10:13 +02:00
Stephane Nicoll 5d2e0b910b Upgrade to Undertow 2.0.20.Final 
Closes gh-16767
 2019-05-09 09:10:11 +02:00
Stephane Nicoll cd5ad2201c Upgrade to Netty Tcnative 2.0.25.Final 
Closes gh-16766
 2019-05-09 09:10:10 +02:00
Stephane Nicoll 46bdfdd325 Upgrade to Netty 4.1.36.Final 
Closes gh-16765
 2019-05-09 09:10:09 +02:00
Stephane Nicoll a0ca84d72c Upgrade to Hazelcast 3.11.3 
Closes gh-16764
 2019-05-09 09:10:08 +02:00
Stephane Nicoll 2e67b96f6e Upgrade to Appengine Sdk 1.9.74 
Closes gh-16763
 2019-05-09 09:10:06 +02:00
Stephane Nicoll c9d4ddd911 Upgrade to Reactor Dysprosium-M1 
Closes gh-16595
 2019-05-09 08:37:07 +02:00
Stephane Nicoll b6911799b8 Upgrade to Reactor Californium-SR7 
Closes gh-16723
 2019-05-09 08:35:38 +02:00
Stephane Nicoll 1de6f68238 Document that JUnit 5 is the default 
See gh-14736
 2019-05-08 16:05:44 +02:00
Madhura Bhave 684a1c7a3c Migrate tests to JUnit5 testcontainer extensions 
Closes gh-15456
 2019-05-08 16:05:44 +02:00
Madhura Bhave 1db1c8b03c Validate our own tests work with JUnit5 and the vintage engine 
Closes gh-14737

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
 2019-05-08 16:05:44 +02:00
Madhura Bhave d9f339a1b6 Include Junit5 dependencies in Spring Boot Starter Test 
Closes gh-14736

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
 2019-05-08 16:05:43 +02:00
Madhura Bhave d15347d4e5 Add Junit5 OutputCapture Extension 
Closes gh-14738
 2019-05-08 16:05:43 +02:00
Andy Wilkinson 95003d79d7 Merge branch '2.1.x' 
Closes gh-16746
 2019-05-08 14:51:27 +01:00
Andy Wilkinson 1297068528 Add dependency management for remaining non-example Kafka modules 
See gh-16728
 2019-05-08 14:50:16 +01:00
Gary Russell a5e26bff92 Add dependency management for kafka-streams-test-utils 
See gh-16728
 2019-05-08 14:50:16 +01:00
Stephane Nicoll c91578bbae Define surefire test provider to use 
The `spring-boot-test` module has a dependency to TestNG to validate
some part of the test infrastructure but no tests are actually written
using TestNG. The presence of TestNG is a trigger for the maven surefire
plugin and it attempts to run tests using it.

This commit defines the explicit provider to use (JUnit 4)

Closes gh-16735
 2019-05-07 14:22:53 +02:00
Stephane Nicoll 71b2ab0f0f Merge branch '2.1.x' 2019-05-07 14:04:01 +02:00
Stefan Dellmuth ecdcec2b5d Polish indentation 
Closes gh-16731
 2019-05-07 13:46:58 +02:00
Stephane Nicoll ff803a86a0 Merge branch '2.1.x' 
Closes gh-16726
 2019-05-06 15:00:07 +02:00
Stephane Nicoll 52c8bbaddf Upgrade to Maven Surefire Plugin 2.22.2 
Closes gh-16725
 2019-05-06 14:59:28 +02:00
Stephane Nicoll f0a9e0f616 Switch to Reactor snapshots 
See gh-16723
 2019-05-06 14:25:17 +02:00
Stephane Nicoll 9d72b74252 Merge branch '2.1.x' 2019-05-06 12:15:44 +02:00
Stephane Nicoll d8f1bd351f Polish "Add link to Heroku article" 
Closes gh-16719
 2019-05-06 12:12:56 +02:00
Tetsuya Hasegawa 2655122466 Add link to Heroku article 
See gh-16719
 2019-05-06 12:12:43 +02:00
Stephane Nicoll 5aeb31700d Merge branch '2.1.x' 2019-05-04 09:14:04 +02:00
Stephane Nicoll 680ac85a2a Polish 
See gh-16714
 2019-05-04 09:13:46 +02:00
Madhura Bhave 07d6eb6397 Disable auditing infrastructure by default 
Prior to this commit, the audit auto-configuration provided
an `InMemoryAuditEventRepository` bean. This commit changes the auto-config
so that an `AuditEventRepository` is not provided and instead the auto-config
is conditional on the presence of a `AuditEventRepository` bean. This is done
to encourage the use of a custom implementation of `AuditEventRepository`
since the in-memory one is quite limited and not suitable for production.
A flag is available if the auto-configuration needs to be turned off even
in the presence of a bean.

Closes gh-16110
 2019-05-03 13:48:29 -07:00
Madhura Bhave e2b15c3f2a Fix tests 
See gh-15039
 2019-05-03 12:32:06 -07:00
Madhura Bhave de128fed20 Disable HttpTrace infrastructure by default 
Prior to this commit, the http trace auto-configuration provided
an `InMemoryHttpTraceRepository` bean. This commit changes the auto-config
so that an `HttpTraceRepository` is not provided and instead the auto-config
is conditional on the presence of a `HttpTraceRepository` bean. This is done
to encourage the use of a custom implementation of `HttpTraceRepository`
since the in-memory one is quite limited and not suitable for production.
A flag is available if the auto-configuration needs to be turned off even
in the presence of a bean.

Closes gh-15039
 2019-05-03 12:00:37 -07:00
Stephane Nicoll fc9cd86718 Merge branch '2.1.x' 2019-05-03 15:42:38 +02:00
Stephane Nicoll 51c0fdcab1 Polish "Document that JUnit 4 is the default" 
Closes gh-16707
 2019-05-03 15:41:44 +02:00
Tetsuya Hasegawa e36ca923b9 Document that JUnit 4 is the default 
See gh-16707
 2019-05-03 14:41:54 +02:00
Andy Wilkinson f35b91a172 Raise minimum supported version of Gradle to 4.10 and encourage use of 5.x 
Closes gh-16681
 2019-05-03 13:07:15 +01:00
Brian Clozel 1f897ad923 Fix DefaultErrorWebExceptionHandler test 2019-05-02 10:14:08 +02:00
Johnny Lim 21b05bbafc Polish RSocketServerBootstrap bean name 
Closes gh-16700
 2019-05-02 09:19:41 +02:00
Stephane Nicoll f056b952d9 Merge branch '2.1.x' 2019-05-02 09:18:21 +02:00
Johnny Lim 1b9a4d5e45 Polish CompressionConnectorCustomizerTests 
Closes gh-16699
 2019-05-02 09:13:47 +02:00
Madhura Bhave cc99b13ecb Merge branch '2.1.x' 2019-05-01 10:26:31 -07:00
Madhura Bhave c9752f165f Fix javadoc 2019-05-01 10:23:52 -07:00
Andy Wilkinson 538030b57e Merge branch '2.1.x' 
Closes gh-16693
 2019-05-01 11:20:56 +01:00
Andy Wilkinson 881fbeff43 Test the Gradle Plugin against Gradle 5.4.1 
Closes gh-16576
 2019-05-01 10:47:35 +01:00
Johnny Lim cb0e3c793b Polish 
Closes gh-16688
 2019-05-01 08:41:44 +02:00
Stephane Nicoll ed538a2e31 Merge branch '2.1.x' 2019-05-01 08:41:27 +02:00
Stephane Nicoll 19413c0c71 Polish 
See gh-16688
 2019-05-01 08:41:07 +02:00
Stephane Nicoll 8045bf1f50 Polish "Allow configuration of auto-timed metrics" 
Closes gh-15988
 2019-05-01 08:17:06 +02:00
Tadaya Tsuyukubo 4df6f5dee0 Allow configuration of auto-timed metrics 
When `management.metrics.web.server.auto-time-requests` is enabled
(default=true), Spring Boot collects metrics on controller methods even
when they are not annotated with `@Timed`.

When this happens, created metrics are based on the default
`@Timed` configuration and there is no way to customize the
configuration of those auto-timed controller metrics.

This commit adds default configurations to auto-timed requests on both
client and server sides.

See gh-15988
 2019-05-01 08:16:42 +02:00
Madhura Bhave 3d814a5288 Move to Reactor Dysprosium snapshots 
This should fix the NoClassDefFound errors after moving to Framework
snapshots
 2019-04-30 17:09:40 -07:00
Madhura Bhave ffd979c2bb Document missing SpringApplication events 
This commit also documents `ContextRefreshedEvent` and
`WebServerInitializedEvent`.

Closes gh-7382
 2019-04-30 16:46:48 -07:00
Madhura Bhave fd97066604 Use MergedAnnotation.getRoot() method 
Closes gh-16661
 2019-04-30 16:19:18 -07:00
Madhura Bhave 8b30ad21bb Merge pull request #16622 from Kedar Joshi 
* pr/16622:
  Polish "Document use of @Profile with @ConfigurationProperties scanning"
  Document use of @Profile with @ConfigurationProperties scanning
 2019-04-30 16:08:42 -07:00
Madhura Bhave d4435e015c Polish "Document use of @Profile with @ConfigurationProperties scanning" 
Closes gh-16622
 2019-04-30 16:07:33 -07:00
Kedar Joshi 13b155eb2a Document use of @Profile with @ConfigurationProperties scanning 
See gh-16612
 2019-04-30 15:59:04 -07:00
Brian Clozel c4938055b4 Polish "Separate compound properties in appendices" 
Closes gh-16480
 2019-04-30 15:32:26 +02:00
dreis2211 5b63b807ad Separate compound properties in appendices 2019-04-30 15:25:39 +02:00
Stephane Nicoll 922ceed63a Polish "Auto-configure ReactiveStringRedisTemplate if necessary" 
Closes gh-16604
 2019-04-30 14:51:47 +02:00
Qiang Lee 866233bd2f Auto-configure ReactiveStringRedisTemplate if necessary 
See gh-16604
 2019-04-30 14:43:35 +02:00
Stephane Nicoll 81543873d4 Merge branch '2.1.x' 2019-04-30 14:33:12 +02:00
ielatif 3ffbe256f1 Exclude HikariCP specific dependency from Quartz 
Closes gh-16628
 2019-04-30 14:31:17 +02:00
Tetsuya Hasegawa 56c769f05c Remove redundant info 
Closes gh-16668
 2019-04-30 09:05:48 +02:00
Stephane Nicoll 05957689f4 Polish "Add jOOQ to SQL logging group" 
Closes gh-16678
 2019-04-30 08:57:32 +02:00
Maciej Walkowiak d7722e328a Add jOOQ to SQL logging group 
See gh-16678
 2019-04-30 08:55:07 +02:00
Toshiaki Maki e203f6a5f5 Fix typo 
Closes gh-16684
 2019-04-30 08:40:35 +02:00
Johnny Lim e22c2e5687 Polish 
Closes gh-16685
 2019-04-30 08:24:18 +02:00
Madhura Bhave a0d425332d Use ImportBeanDefintionRegistrar directly instead of import selector 
Closes gh-16679
 2019-04-29 18:01:31 -07:00
Andy Wilkinson 5639685770 Polish "Prefer file: to jar:file: URLs in launcher" 
See gh-16248
 2019-04-29 14:41:03 +01:00
hengyunabc c1b34d0307 Prefer file: to jar:file: URLs in launcher 
See gh-16248
 2019-04-29 14:39:20 +01:00
Stephane Nicoll 704da1750b Polish "Add support for Hazelcast YAML configuration" 
Closes gh-16632
 2019-04-29 15:16:43 +02:00
Rafal Leszko 82e18ae88f Add support for Hazelcast YAML configuration 
Since Hazlecast 3.12, YAML configuration format is supported in
addition to XML. Therefore, this change makes Spring Boot automatically
discover not only `hazelcast.xml` (and `hazelcast-client.xml`), but also
`hazelcast.yaml` (and `hazelcast-client.yaml`).

See gh-16632
 2019-04-29 14:19:10 +02:00
Brian Clozel b527d364dc Reinstate single page reference documentation 
This commit reinstates the single-page variant for the Spring Boot
reference documentation.

Now the single and multi-page variants are hosted under the same
`"html"` folder, as `"index.html"` and `"single-index.html"`.
Note that files ending in `"index.html`" are treated as index files by
the spring-doc-resources project and their table of contents do not
display a "Back to index" link.

Fixes gh-16295
 2019-04-29 09:04:36 +02:00
Stephane Nicoll 9cde736b59 Merge branch '2.1.x' 2019-04-26 12:01:11 +03:00
Stephane Nicoll 3c5ec8a04c Merge branch '2.0.x' into 2.1.x 2019-04-26 11:53:02 +03:00
Stephane Nicoll ac9ee952c7 Properly merge fix 
See gh-16666
 2019-04-26 11:52:25 +03:00
dreis2211 cf05959375 Optimize ConfigurationPropertyName.buildToString() 
See gh-16658
 2019-04-25 17:18:55 +01:00
Phillip Webb 32040e355b Merge branch '2.1.x' 
Closes gh-16649
 2019-04-24 19:50:41 -07:00
Phillip Webb d4151e0b51 Polish "Use Jackson configuration with JsonPath" 
Polish contribution to use a factory method in `AbstractJsonMarshalTester`
rather than additional constructor arguments.

Also change the `JsonContent` tests so that the `Configuration` constructor
is package private. This keeps JsonPath classes out of our public API, at
the expense of limiting custom JsonPath configurations to just our code.

See gh-16629
 2019-04-24 19:45:43 -07:00
Phillip Webb 17aaf26590 Use consistent javadoc style for annotation links 
Closes gh-13920
 2019-04-24 19:37:59 -07:00
Phillip Webb 1e44aba772 Fix compiler warnings and polish 
Fix various compiler warnings and apply a little polish.
 2019-04-24 19:37:42 -07:00
Diego Berrueta 756a7f12a3 Use Jackson configuration with JsonPath 
Update `JacksonTester` so that the JsonPath instance is explicitly configured
with both a `JacksonJsonProvider` and a `JacksonMappingProvider`.

Prior to this commit, the handling of special characters was not symmetrical
between the serialization (handled via the JacksonTester) and the parsing (handled
via JsonPath) due to the fact that JsonPath used `SimpleJson` as its parser.

See gh-16629
 2019-04-24 18:15:46 -07:00
Andy Wilkinson 4754386361 Merge branch '2.1.x' 
Closes gh-16644
 2019-04-24 15:09:41 +01:00
Andy Wilkinson 6b20d13b3d Polish "Prevent double update of metrics when CompositeMeterRegistry exists" 
See gh-16221
 2019-04-24 15:02:58 +01:00
Johnny Lim cc285d92dd Prevent double update of metrics when CompositeMeterRegistry exists 
See gh-16221
 2019-04-24 14:54:30 +01:00