Commit Graph

10957 Commits

Author SHA1 Message Date
Phillip Webb d8e1297eed Merge branch '1.5.x' 2017-02-05 18:13:44 -08:00
Phillip Webb 87b8ce61de Fix Invalid target for Validator error
Update `PropertiesConfigurationFactory` so that the validator is only
set when it supports the target object.

Fixes gh-8149
2017-02-05 18:11:33 -08:00
Stephane Nicoll fb19b36595 Merge branch '1.5.x' 2017-02-05 09:26:52 +01:00
Stephane Nicoll dc75f13754 Remove deprecated metadata for spring.pidfile 2017-02-05 09:26:32 +01:00
Stephane Nicoll 3d1f8aa8d7 Merge branch '1.4.x' into 1.5.x 2017-02-05 09:25:48 +01:00
Stephane Nicoll 21e866535c Merge pull request #8196 from zhanhb:patch-1
* pr/8196:
  Polish pid metadata
  Fix pid properties link in documentation
2017-02-05 09:25:25 +01:00
Stephane Nicoll a30461c5c7 Polish pid metadata
This commit moves the `spring.pid.*` metadata to the relevant project. It
also updates the doc to refer to the new `ApplicationPidFileWriter`
rather than the one in its deprecatred form.

Closes gh-8196
2017-02-05 09:23:56 +01:00
zhanhb 22ba7b93b2 Fix pid properties link in documentation
See gh-8196
2017-02-05 09:14:01 +01:00
Stephane Nicoll 513db481a6 Merge pull request #8147 from shakuzen:patch-13
* pr/8147:
  Remove HikariCP-java6 dependency management
2017-02-03 09:01:21 +01:00
Tommy Ludwig 653366d664 Remove HikariCP-java6 dependency management
Dependency management for the `HikariCP-java6` dependency is no longer
needed since Java 6 is no longer supported by Spring Boot.

The HikariDriverConfigurationFailureAnalyzer has been updated with the
current message thrown by HikariCP in this failure scenario.

Closes gh-8147
2017-02-03 08:52:36 +01:00
Andy Wilkinson aa19cad770 Merge branch '1.5.x' 2017-02-02 13:48:30 +00:00
Andy Wilkinson b9b0cdb342 Merge branch '1.4.x' into 1.5.x 2017-02-02 13:48:19 +00:00
Andy Wilkinson 2f50d515a1 Apply root to URIs directly rather than relying on expansion
Previously, TestRestTemplate applied the root URI to URIs by
converting them to a String and then passing the String to the
RestTemplate delegate. Being a String, meant that the URI passed
through RestTemplate's standard URI template expansion processing
using the configured UriTemplateHandler. While this caused the root
URI to be applied, it also had the unwanted side-effect of
encoding the URI for a second time.

This commit updates TestRestTemplate so that, when configured with a
RootUriTemplateHandler, it applies the root URI directly and then
passes a modified URI to the RestTemplate delegate. Being a URI means
that no template expansion is performed and the possible double
encoding is avoided.

Closes gh-8163
2017-02-02 13:28:52 +00:00
Andy Wilkinson 07c39f1c62 Upgrade to AssertJ 3.6.2
Closes gh-8182
2017-02-02 13:03:30 +00:00
Andy Wilkinson 77b5c63ec0 Build against SI 5.0.0 snapshots in preparation for M3
See gh-8180
2017-02-02 12:01:08 +00:00
Andy Wilkinson 071668a2e6 Start building against Spring Kafka 2.0 snapshots
See gh-8179
2017-02-02 11:55:19 +00:00
Stephane Nicoll 10ca22082b Polish
See gh-8148
2017-02-01 09:11:09 +01:00
Stephane Nicoll 5c663a9ece Merge branch '1.5.x' 2017-02-01 09:08:33 +01:00
Stephane Nicoll 9b952dd3a8 Merge pull request #8148 from izeye:polish-20170131
* pr/8148:
  Polish
2017-02-01 09:08:16 +01:00
Johnny Lim 846994e498 Polish
Closes gh-8148
2017-02-01 09:07:47 +01:00
Stephane Nicoll eca61af8b1 Merge pull request #8161 from izeye:clean-system-property
* pr/8161:
  Clear system property in SpringApplicationTests
2017-02-01 09:00:45 +01:00
Johnny Lim cedc4cd9f4 Clear system property in SpringApplicationTests
See gh-8101
Closes gh-8161
2017-02-01 09:00:21 +01:00
Stephane Nicoll 715f8d7436 Merge branch '1.5.x' 2017-02-01 08:57:22 +01:00
Stephane Nicoll 8a0f8cf953 Merge branch '1.4.x' into 1.5.x 2017-02-01 08:57:07 +01:00
Stephane Nicoll 7e44029224 Merge pull request #8157 from rajadilipkolli:patch-1
* pr/8157:
  Polish contribution
  Update copyright header
2017-02-01 08:56:43 +01:00
Stephane Nicoll b9ede6b281 Polish contribution
Closes gh-8157
2017-02-01 08:56:22 +01:00
Raja Kolli a1c601ca28 Update copyright header
See gh-8157
2017-02-01 08:55:36 +01:00
Phillip Webb eb4803832b Merge branch '1.5.x' 2017-01-31 17:14:40 -08:00
Phillip Webb 4fa38aeba4 Consider hierarchy when searching for @Validated
Update `ConfigurationPropertiesBindingPostProcessor` to use a more
exhaustive hierarchy search when checking for `@Validated`.

Fixes gh-8150
2017-01-31 17:09:02 -08:00
Phillip Webb 36c1db0223 Merge branch '1.5.x' 2017-01-31 13:27:09 -08:00
Phillip Webb 21234b36de Ensure `JmxEndpoint` beans get context object IDs
Update `EndpointMBeanExporter` to ensure that `JmxEndpoint` as well
as regular `Endpoint` beans are considered when searching the parent
context.

Prior to this commit if the same `JmxEndpoint` was registered in the
both the child and parent context then the `context=` element of the
name wasn't added.

Fixes gh-8152
2017-01-31 13:25:59 -08:00
Brian Clozel 1709a3ad96 Adapt to Assert.instanceOf changes
Since SPR-15196, the behavior of `Assert` methods changed and some were
deprecated. This commit adapts to the new error mechanism implemented in
`Assert.instanceOf`.

Fixes gh-8140
2017-01-31 11:42:20 +01:00
Brian Clozel 7f39d5a865 Remove usage of Assert.notNull(Object)
This commit updates the Spring Boot codebase to adapt to the removal of
`Assert.notNull(Object)` in SPR-15196.

See gh-8140
2017-01-31 00:46:40 +01:00
Madhura Bhave 29dc6a973c Merge branch '1.5.x' 2017-01-30 15:30:06 -08:00
Madhura Bhave 5dafa3ae9c Fixup version numbers following release 2017-01-30 15:27:42 -08:00
Andy Wilkinson 95f659f4f9 Add new WebApplicationType enum to pave the way for Web Flux support
Closes gh-8077
2017-01-30 20:26:24 +00:00
Spring Buildmaster 5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Andy Wilkinson 4e3d606fad Merge pull request #7744 from Artem Bilan
* gh-7744:
  Make use of new extensions point in IntegrationComponentScanRegistrar
2017-01-30 14:37:18 +00:00
Artem Bilan eccefd1343 Make use of new extensions point in IntegrationComponentScanRegistrar
SI 5 has made IntegrationComponentScanRegistrar more extensible by
offering a method for getting the back packages that can be
overridden.

This commit takes advantage of that change by removing our creation
of "fake" annotation metadata and overriding getBackPackages to return
the auto-configuration packages instead.

Closes gh-7744
2017-01-30 14:36:51 +00:00
Andy Wilkinson c00638fee3 Remove Thymeleaf's layout dialect from its starter and update samples
Closes gh-7557
2017-01-30 14:20:50 +00:00
Andy Wilkinson 9a7e5caea7 Merge branch '1.5.x' 2017-01-30 13:17:17 +00:00
Andy Wilkinson 20c1370107 Correct the scope of the spring-boot-test-support dependency
Closes gh-8136
2017-01-30 13:15:49 +00:00
Andy Wilkinson d9f4f51e5b Merge branch '1.5.x' 2017-01-30 12:27:57 +00:00
Andy Wilkinson a9656145de Fix up version numbers following release 2017-01-30 12:27:04 +00:00
Spring Buildmaster a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Andy Wilkinson 95ccd760ae Merge pull request #5344 from Eddú Meléndez
* gh-5344:
  Polish "Upgrade to Flyway 4.0"
  Upgrade to Flyway 4.0
2017-01-30 11:15:40 +00:00
Andy Wilkinson 4ea7dc6f31 Polish "Upgrade to Flyway 4.0"
See gh-5344
2017-01-30 10:48:36 +00:00
Eddú Meléndez a270c13d6f Upgrade to Flyway 4.0
Closes gh-5344
2017-01-30 10:22:51 +00:00
Andy Wilkinson 15639d39b0 Merge branch '1.5.x' 2017-01-30 10:02:27 +00:00
Andy Wilkinson dd4051686b Remove empty test
The caching behaviour when using ImportAutoConfiguration is covered
by tests in spring-boot-test-auto-configuration, specifically by
ImportsContextCustomizerFactoryWithAutoConfigurationTests.

See gh-7953
2017-01-30 09:59:11 +00:00