Phillip Webb
dcad69fd23
Fix artifactory property used on docs
...
Fixes gh-10608
2017-10-11 18:43:46 -07:00
Phillip Webb
4f0a41d80e
Fix pipeline stage script
2017-10-11 15:22:46 -07:00
Phillip Webb
ff02d70ed4
Merge pull request #10601 from izeye/fix-broken-links-20171012
...
* pr/10601:
Fix broken documentation links
2017-10-11 13:31:10 -07:00
Johnny Lim
a51765d0f4
Fix broken documentation links
...
Update links following recent project restructure.
Closes gh-10601
2017-10-11 13:30:35 -07:00
Phillip Webb
c98d6b295a
Merge pull request #10603 from izeye/patch-49
...
* pr/10603:
Fix broken README.adoc
2017-10-11 13:25:24 -07:00
Johnny Lim
4abd3fe10b
Fix broken README.adoc
...
Closes gh-10603
2017-10-11 13:25:06 -07:00
Phillip Webb
97afe8e938
Fix package tangle in properties source
...
Update `SpringConfigurationPropertySource` so that it no longer
references types in `org.springframework.boot.env`.
Closes gh-10592
2017-10-11 11:24:46 -07:00
Phillip Webb
f48550aa44
Fix package tangle in binder
...
Update the `BinderConversionService` so that it no longer references
classes from `org.springframework.boot.context.properties.bind`.
See gh-10592
2017-10-11 11:23:14 -07:00
Andy Wilkinson
1bd44d89d6
Test metrics endpoint using tag available on Java 9 as well as 8
...
See gh-10524
2017-10-11 16:50:23 +01:00
Andy Wilkinson
bcfb1d17b1
Merge branch '1.5.x'
2017-10-11 16:19:25 +01:00
Andy Wilkinson
c44b912fc2
Ensure that Undertow is stopped when it fails to start
...
Previously, if Undertow failed to start, some of Undertow's
internal components would have been started but the started field of
UndertowEmbeddedServletContainer remained false. This meant that when
stop() was called nothing was done as the container believed it had
not been started.
This commit updates UndertowEmbeddedServletContainer to stop both the
DeploymentManager and the Undertow instance in start() if an exception
is thrown. This aligns the behaviour of
UndertowEmbeddedServletContainer with that of the Tomcat equivalent.
Closes gh-10528
2017-10-11 13:30:53 +01:00
Phillip Webb
325b2b0904
Merge pull request #10590 from spencergibb/patch-1
...
* pr/10590:
Change @ConditionalOnClass from Servlet to Flux
2017-10-10 21:46:43 -07:00
Spencer Gibb
ce2058fa97
Change @ConditionalOnClass from Servlet to Flux
...
Update `ReactiveManagementContextAutoConfiguration` to check for a
`Flux` class rather than `Servlet`.
Closes gh-10590
2017-10-10 21:45:24 -07:00
Phillip Webb
f337323819
Allow recursive binding in Maps
...
Update `Binder` so that Maps containing references to themselves may
be bound. The existing stack-overflow protection (required when binding
a bean to a non enumerable source) now only applies to bean properties.
Fixes gh-9801
2017-10-10 21:41:53 -07:00
Madhura Bhave
3ec3b64d45
Guard against binding non-instantiable types
...
Update `JavaBeanBinder` so that null instances that are non-instantiable
are not bound.
Fixes gh-10131
2017-10-10 17:55:35 -07:00
Madhura Bhave
b7c37c2807
Expose webServer from ReactiveWebServerApplicationContext
...
Closes gh-9746
2017-10-10 14:51:11 -07:00
Phillip Webb
96cb948461
Merge pull request #10535 from jkschneider/micrometer-rc2-2
...
* pr/10535:
Polish MetricsEndpoint
Support composite registries in MetricsEndpoint
2017-10-10 14:04:25 -07:00
Phillip Webb
22a6ee03eb
Polish MetricsEndpoint
...
See gh-10535
2017-10-10 13:58:10 -07:00
Jon Schneider
37975836f0
Support composite registries in MetricsEndpoint
...
Update `MetricsEndpoint` to deal with `CompositeMeterRegistry`
instances.
Closes gh-10535
2017-10-10 13:57:51 -07:00
Phillip Webb
b3555fa5c5
Fix checkstyle violation in properties file
...
See gh-10565
2017-10-10 13:48:33 -07:00
Phillip Webb
9106723c3b
Merge pull request #10512 from dreis2211/cleanup-empty-string-concat
...
* pr/10512:
Remove concatenations with empty string
2017-10-10 12:44:51 -07:00
dreis2211
a76005e8d9
Remove concatenations with empty string
...
Closes gh-10512
2017-10-10 12:44:33 -07:00
Phillip Webb
f35af88de5
Merge pull request #10565 from thiagohirata/fix/#10564
...
* pr/10565:
Update OriginTrackedPropertiesLoader to ISO 8859-1
2017-10-10 12:31:53 -07:00
Thiago Hirata
85e71f2373
Update OriginTrackedPropertiesLoader to ISO 8859-1
...
Align `OriginTrackedPropertiesLoader` with Java default property loading
by using ISO 8859-1 character encoding.
Closes gh-10565
2017-10-10 12:31:43 -07:00
Phillip Webb
8e030d4769
Upgrade to Spring Session 2.0.0.M5
...
Closes gh-10326
2017-10-10 12:19:25 -07:00
Phillip Webb
1c7177d24a
Upgrade to Spring Security 5.0.0.M5
...
Closes gh-10327
2017-10-10 12:17:13 -07:00
Phillip Webb
6de12b20f0
Upgrade CI to use artifactory-resource 0.0.2
...
Fixes gh-10570
2017-10-10 12:15:02 -07:00
Phillip Webb
748e0779b6
Update copyright year for changed files
2017-10-10 11:56:13 -07:00
Phillip Webb
d62d829c19
Polish
2017-10-10 11:55:47 -07:00
Phillip Webb
0118653878
Upgrade to Sqlite Jdbc 3.20.1
...
Closes gh-10585
2017-10-10 11:03:43 -07:00
Phillip Webb
80c85568fa
Upgrade to Spring Ldap 2.3.2.RELEASE
...
Closes gh-10584
2017-10-10 11:03:42 -07:00
Phillip Webb
6f159d2ee7
Upgrade to Javassist 3.22.0-CR2
...
Closes gh-10583
2017-10-10 11:03:41 -07:00
Phillip Webb
d1ea57f496
Upgrade to Johnzon Jsonb 1.1.4
...
Closes gh-10582
2017-10-10 11:03:41 -07:00
Phillip Webb
34f290afbb
Upgrade to Httpcore 4.4.8
...
Closes gh-10581
2017-10-10 11:03:40 -07:00
Phillip Webb
702e831fcd
Upgrade to Activemq 5.15.1
...
Closes gh-10580
2017-10-10 11:03:39 -07:00
Phillip Webb
96287173f9
Upgrade to Byte Buddy 1.7.6
...
Closes gh-10579
2017-10-10 11:03:38 -07:00
Phillip Webb
7404221678
Upgrade to Jest 5.3.3
...
Closes gh-10578
2017-10-10 11:03:37 -07:00
Phillip Webb
e3d864670f
Upgrade to Rest Assured 3.0.5
...
Closes gh-10577
2017-10-10 11:03:37 -07:00
Phillip Webb
0be541e0fb
Upgrade to Rxjava2 2.1.5
...
Closes gh-10576
2017-10-10 11:03:36 -07:00
Phillip Webb
e985998256
Upgrade to Unboundid Ldapsdk 4.0.1
...
Closes gh-10575
2017-10-10 11:03:35 -07:00
Phillip Webb
e16807e2f6
Upgrade to Mssql Jdbc 6.2.2.jre8
...
Closes gh-10574
2017-10-10 11:03:35 -07:00
Phillip Webb
02ba788c3f
Upgrade to Couchbase Client 2.5.1
...
Closes gh-10573
2017-10-10 11:03:34 -07:00
Madhura Bhave
a06ec4a877
Mongo Uri overrides host and port
...
Fixes gh-4017
2017-10-10 09:23:49 -07:00
Stephane Nicoll
ba1cf9a355
Merge branch '1.5.x'
2017-10-10 16:57:47 +02:00
Stephane Nicoll
c68173082d
Upgrade to Spring Framework 4.3.12.RELEASE
...
Closes gh-10561
2017-10-10 16:56:58 +02:00
Stephane Nicoll
dad8f59ba6
Merge branch '1.5.x'
2017-10-09 15:53:47 +02:00
Stephane Nicoll
3e68c55db9
Start build against Spring Framework snapshots for 4.3.12.RELEASE
...
See gh-10561
2017-10-09 15:51:47 +02:00
Stephane Nicoll
c32276d8fa
Update .gitignore with changes on master
2017-10-09 15:50:49 +02:00
Phillip Webb
0cc33d5c7c
Revert class name change
...
This reverts commit de7b624643
.
2017-10-08 17:09:12 -07:00
Phillip Webb
0be119eadd
Don't deploy spring-boot-test-support
...
Fixes gh-10518
2017-10-08 16:57:58 -07:00