Commit Graph

21208 Commits

Author SHA1 Message Date
Stephane Nicoll
c4adb76df2 Merge branch '1.5.x' 2017-10-16 16:48:49 +02:00
Stephane Nicoll
00142dc70f Fixup version numbers following release 2017-10-16 16:48:39 +02:00
Spring Buildmaster
c0f9f64776 Next Development Version 2017-10-16 12:36:43 +00:00
Andy Wilkinson
fc68af33c4 Correct typos (sonattype -> sonatype) in pipeline.yml 2017-10-16 12:14:16 +01:00
Andy Wilkinson
74d7a53119 Trigger JDK 9 build when Git repo changes
Closes gh-10515
2017-10-16 12:03:30 +01:00
Andy Wilkinson
8d55b5afae Merge branch '1.5.x' 2017-10-16 11:30:44 +01:00
Andy Wilkinson
44b1f582ad Upgrade to GemFire 8.2.7
Closes gh-10651
2017-10-16 11:29:52 +01:00
Andy Wilkinson
f8602817af Merge branch '1.5.x' 2017-10-13 16:30:17 +01:00
Andy Wilkinson
dfb87c67fb Merge pull request #10635 from Janne Valkealahti
* gh-10635:
  Fix typo in documentation
2017-10-13 16:30:10 +01:00
Janne Valkealahti
ac2bbea091 Fix typo in documentation
- As error handling sample is using `CustomErrorType`, fix
  description which mentions `CustomerErrorType`.
2017-10-13 16:28:39 +01:00
Andy Wilkinson
162a48806e Update custom layout sample so it builds with Java 9
Previously, the custom layout sample did not configure the source
and target for the compiler. This meant that both defaulted to 1.5
which is not supported by Java 9's javac. The oldest support version
is 1.6.

This commit sets the maven.compiler.source and maven.compiler.target
properties to 1.8 (the lowest version support by Boot 2.0) allowing
the sample to build with both Java 8 and Java 9.

See gh-10515
2017-10-13 16:22:50 +01:00
Andy Wilkinson
63b7591031 Add another dependency required for javadoc generation with Java 9
See gh-10515
2017-10-13 15:11:17 +01:00
Andy Wilkinson
c3d10a811e Add dependencies required for javadoc generation with Java 9
See gh-10515
2017-10-13 14:36:41 +01:00
Andy Wilkinson
44acef2ae2 Merge branch '1.5.x' 2017-10-13 12:43:00 +01:00
Andy Wilkinson
ffdff1cdc2 Consider multiple MBeanExporters when excluding beans from export
Closes gh-10632
2017-10-13 12:31:57 +01:00
Andy Wilkinson
be09f1c256 Merge branch '1.5.x' 2017-10-13 12:27:51 +01:00
Andy Wilkinson
8a653d2c8a Upgrade to Spring Ldap 2.3.2.RELEASE
Closes gh-10631
2017-10-13 11:27:06 +01:00
Andy Wilkinson
b6a471a6d8 Upgrade to Httpcore 4.4.8
Closes gh-10630
2017-10-13 11:27:05 +01:00
Andy Wilkinson
9f63e4c36d Upgrade to Appengine Sdk 1.9.58
Closes gh-10629
2017-10-13 11:27:05 +01:00
Andy Wilkinson
3d299447cc Merge branch '1.5.x' 2017-10-13 10:57:34 +01:00
Andy Wilkinson
2eb0c3ba1e Merge pull request #10588 from Eddú Meléndez
* gh-10588:
  Polish "Provide informative reason when rejecting request with invalid level"
  Provide informative reason when rejecting request with invalid level
2017-10-13 10:57:17 +01:00
Andy Wilkinson
43aa7dbaf1 Polish "Provide informative reason when rejecting request with invalid level"
See gh-10588
2017-10-13 10:55:35 +01:00
Eddú Meléndez
9e5a1b32c8 Provide informative reason when rejecting request with invalid level
Previously, bad request with no reason was included in the response.
This commit introduces the reason when invalid log level is sent in the
request.

Fixes gh-10588
2017-10-13 10:54:14 +01:00
Phillip Webb
ac4b923b88 More promote script fixes
See gh-9316
2017-10-12 09:35:13 -07:00
Brian Clozel
81d1b3c6ee Build against Spring Framework 5.0.1.BUILD-SNAPSHOT
See gh-10587
2017-10-12 15:52:11 +02:00
Andy Wilkinson
273defdb1f Merge branch '1.5.x' 2017-10-12 14:40:02 +01:00
Andy Wilkinson
5acd6c40eb Merge pull request #10554 from Sebastian Thomschke
* gh-10554:
  Honor logging.path config in filePattern for Log4j2 RollingFile
2017-10-12 14:39:56 +01:00
Sebastian Thomschke
7441d6bd86 Honor logging.path config in filePattern for Log4j2 RollingFile
Previously, rolled over files were always written to logs/. This
commit ensures that rotated logs are written into the directory
specified in the application config's logging.path property.

Closes gh-10554
2017-10-12 14:39:21 +01:00
Andy Wilkinson
f81a1131ca Merge branch '1.5.x' 2017-10-12 14:17:54 +01:00
Andy Wilkinson
c0d9adce7e Upgrade to Spring Data Ingalls SR8
Closes gh-10606
2017-10-12 14:17:12 +01:00
Phillip Webb
39e680ddc1 Increase promotion timeouts
See gh-9316
2017-10-11 18:58:04 -07:00
Phillip Webb
c20af0f57a Fix promote target repo
See gh-9316
2017-10-11 18:49:33 -07:00
Phillip Webb
3dd59ba00b Fix promote script
See gh-9316
2017-10-11 18:44:59 -07:00
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