eb045f1da1
Fix value of property in PropertySource descriptor
...
Prior to this commit, if a key was present in multiple PropertySources,
all descriptors shared the same common value. This commit makes sure
that each PropertySource descriptor shows the value it defines rather
than the one that is promoted in the Environment.
Closes gh-10428
2017-09-26 18:16:53 +02:00
f52c081ec1
Merge pull request #9590 from Justin Rosenberg
...
* gh-9590:
Polish "Support inlining a conf script into the default launch script"
Support inlining a conf script into the default launch script
2017-09-26 15:02:08 +01:00
1e4e64aa8c
Polish "Support inlining a conf script into the default launch script"
...
Closes gh-9590
2017-09-26 14:59:06 +01:00
5ee28a08e1
Support inlining a conf script into the default launch script
...
See gh-9590
2017-09-26 14:58:48 +01:00
c79b76847b
Merge pull request #8988 from Ali Shahbour
...
* gh-8988:
Polish "Find .conf file next to symlink to jar that's using the launch script"
Find .conf file next to symlink to jar that's using the launch script
2017-09-26 14:43:19 +01:00
3db5843c8b
Polish "Find .conf file next to symlink to jar that's using the launch script"
...
Closes gh-8988
2017-09-26 14:42:18 +01:00
56a5888008
Find .conf file next to symlink to jar that's using the launch script
...
See gh-8988
2017-09-26 13:12:40 +01:00
b59bc20f58
Try to make HateoasObjenesisCacheDisablerTests more robust
2017-09-26 12:57:57 +01:00
6d8c333016
Replace convention mappings with PropertyState and Provider
...
Closes gh-9891
2017-09-26 12:48:08 +01:00
6eee9de3c1
Rework BootRun so that it does not subclass JavaExec
...
This commit reworks BootRun so that it no longer subclasses JavaExec.
This provides Boot with greater control of how the executed JVM is
configured, including the possibility of using @Option to provide args
and JVM args via the command line (gh-1176). It also allows some usage
of convention mappings to be removed in favour of PropertyState and
Provider (gh-9891). For users who relied up the advanced (and rather
complex) configuration options provided by JavaExec, an escape hatch
is provided by allowing the JavaExecSpec that's used to execute the
JVM to be customized.
Closes gh-9884
2017-09-26 12:10:43 +01:00
6f3d1797a7
Improve Java9 compatibility
...
This commit workarounds a bug in Surefire, see
https://issues.apache.org/jira/browse/SUREFIRE-1424
It also adds `javax.xml.bind` as it is no longer provided by default
with Java9
See gh-7226
2017-09-26 11:58:53 +02:00
1f7f0c18d5
Merge pull request #10422 from dreis2211:remove-redundant-semicolons
...
* pr/10422:
Remove redundant semicolons
2017-09-26 08:54:58 +02:00
f3472beed8
Remove redundant semicolons
...
Closes gh-10422
2017-09-26 08:38:43 +02:00
bbee943972
Upgrade to Reactor Bismuth-RELEASE
...
Closes gh-10423
2017-09-26 08:24:49 +02:00
33d04f0c91
Merge branch '1.5.x'
2017-09-25 17:07:25 +01:00
616d11c00a
Only wait for background preinit to complete when it has started
...
Closes gh-10362
2017-09-25 17:06:28 +01:00
dd5091f31a
Merge branch '1.5.x'
2017-09-25 16:53:30 +01:00
b602b1da2e
Document expected format for commit time in git.properties
...
Closes gh-10392
2017-09-25 16:53:07 +01:00
edc9a9b269
Merge branch '1.5.x'
2017-09-25 16:47:46 +01:00
7eb9193862
Tolerate absolute URLs in manifest's Class-Path attribute
...
Closes gh-10268
2017-09-25 16:47:27 +01:00
7b675fc53e
Make spring-boot-loader its Java 9 friendly
...
This commit updates the integration tests of "spring-boot-loader" to
not use `@PostConstruct` but rather `InitializingBean`
Closes gh-10274
2017-09-25 15:51:36 +02:00
566f570d96
Polish
2017-09-25 14:36:30 +01:00
2f794ee8d9
Consider MongoOperationsSessionRepository when checking for duplicates
...
See gh-9552
2017-09-25 14:34:03 +01:00
ee1648446e
Merge pull request #9635 from vpavic:ws-wsdl-exposure
...
* pr/9635:
Polish "Add support for Spring WS auto WSDL/XSD exposure"
Add support for Spring WS auto WSDL/XSD exposure
2017-09-25 15:21:39 +02:00
15de6531a5
Polish "Add support for Spring WS auto WSDL/XSD exposure"
...
Closes gh-9635
2017-09-25 15:21:08 +02:00
bb72a4abe1
Add support for Spring WS auto WSDL/XSD exposure
...
This commit adds support for auto-configuration of Spring WS automatic
WSDL and XSD exposure i.e. registration of `WsdlDefinition` and
`XsdDefinition` beans. The bean registration is triggered by configuring
`spring.webservices.wsdl-locations` property which will search the
provided locations for WSDL/XSD files and register appropriate beans.
See gh-9635
2017-09-25 15:21:08 +02:00
32102c693b
Avoid using classes from spring-web in core web endpoint infrastructure
...
Closes gh-10358
2017-09-25 14:05:02 +01:00
3fcaa9765c
Merge pull request #10239 from mpalourdio:mockito-inline
...
* pr/10239:
Add mockito-inline dependency
2017-09-25 14:52:42 +02:00
258514848e
Add mockito-inline dependency
...
Closes gh-10239
2017-09-25 14:52:14 +02:00
1f73e6c2fc
Merge pull request #10309 from garyrussell:kafkaAdmin
...
* pr/10309:
Polish "Add KafkaAdmin Auto Configuration"
Add KafkaAdmin Auto Configuration
2017-09-25 14:50:56 +02:00
868cc4e1e0
Polish "Add KafkaAdmin Auto Configuration"
...
Closes gh-10309
2017-09-25 14:50:34 +02:00
3e1d9fa856
Add KafkaAdmin Auto Configuration
...
Spring for Apache Kafka has added a `KafkaAdmin` feature to automatically
add new topics to the broker.
See gh-10309
2017-09-25 14:26:48 +02:00
c7eb0fb281
Polish
2017-09-25 14:12:24 +02:00
d8cfae7300
Merge pull request #9643 from Eddú Meléndez
...
* gh-9643:
Polish "Add auto-configuration for REST Docs with REST Assured"
Add auto-configuration for REST Docs with REST Assured
2017-09-25 12:48:22 +01:00
352e3ca397
Polish "Add auto-configuration for REST Docs with REST Assured"
...
Closes gh-9643
2017-09-25 12:47:43 +01:00
98b2267a5b
Add auto-configuration for REST Docs with REST Assured
...
See gh-9643
2017-09-25 12:37:11 +01:00
a1e26eaeea
Merge pull request #9552 from Vedran Pavić
...
* gh-9552:
Improve Spring Session MongoDB support naming
2017-09-25 11:03:21 +01:00
e87b14e863
Polish
2017-09-25 12:00:56 +02:00
0c036a69f2
Improve Spring Session MongoDB support naming
2017-09-25 10:51:45 +01:00
c03bb4c1fe
Test the Gradle plugin against Gradle 4.1 and 4.2
...
Closes gh-10417
2017-09-25 10:40:11 +01:00
881d0daff2
Polish
2017-09-25 11:08:54 +02:00
45a24b8705
Upgrade to Log4j 2.9.1
...
This commit uppgrade our Log4j dependency to 2.9.1. It also modifies
ModifiedClassPathRunner so that log4j-*.jar jars are always excluded
from the class path when using the runner. This is necessary due to
a change in Log4j [1] which makes assumptions about the class loader
hierarchy that do not hold true when using the modified class path
runner. Specifically, it assumes that the system class loader should
always be used to load providers. This is exactly what we don't want
to happen when using the modified class path runner as it breaks the
filtering of the class path and leads to Log4j classes being loaded
from both the system class loader and the filtering class loader.
Closes gh-10407
[1] 9422ca7489
2017-09-25 09:48:57 +01:00
3bd5d909c2
Merge branch '1.5.x'
2017-09-25 10:08:21 +02:00
0a8b355c60
Merge pull request #10382 from christophd:patch-1
...
* pr/10382:
Add reference to Citrus simulator Spring Boot starter
2017-09-25 10:07:59 +02:00
ca04b24814
Add reference to Citrus simulator Spring Boot starter
...
Closes gh-10382
2017-09-25 10:07:33 +02:00
9331ee6f35
Merge pull request #10412 from eddumelendez:polish_jackson_config
...
* pr/10412:
Polish JacksonAutoConfiguration
2017-09-25 10:06:13 +02:00
93844bffbc
Polish JacksonAutoConfiguration
...
This commit removes unused constructor parameters introduced in 0c2ecb7
2017-09-25 10:05:29 +02:00
d490b99473
Clarify scope of spring.datasource.platform
...
Closes gh-10416
2017-09-25 10:04:37 +02:00
ae979465b6
Disable deployment tests when building with Java 9
...
Cargo in currently incompatible with Java 9 so this commit disables
the deployment tests that use Cargo when building with Java 9.
Closes gh-10413
2017-09-25 06:59:45 +01:00
d9600bd4b0
Polish
...
Remove duplicate dependency management that appeared in dc5254c3
2017-09-25 06:45:08 +01:00
Stephane Nicoll
Andy Wilkinson
JustinKSU
Ali Shahbour
dreis2211
Vedran Pavic
Michel Palourdio
Gary Russell
Eddú Meléndez
Christoph Deppisch