544d516563
Merge branch '1.4.x' into 1.5.x
2017-05-29 10:26:52 +02:00
250d5f9a52
Deprecate Atomikos console logs properties
...
Those properties are no longer honoured with Atomikos 3.8 and we're
using 3.9 by default.
Closes gh-9292
2017-05-29 10:18:35 +02:00
b5709fd618
Polish
...
See gh-9330
2017-05-28 17:44:58 +02:00
b61b1f0e08
Make sure Atomikos default are applied consistently
...
This commit makes sure to apply Atomikos defaults also adds a test that
validates Atomikos defaults are consistent.
As a side effect of that, `threadedTwoPhaseCommit` is now `false` (which
is effectively what users got with no customization anyway since that
default was changed in Atomikos 3.7
Closes gh-9141
2017-05-22 15:43:12 +02:00
57dfbd50a7
Fix documentation for health endpoint security
...
Fixes gh-9273
2017-05-19 16:22:25 -07:00
f8de022f0a
Fix typo
...
Closes gh-9257
2017-05-18 13:27:43 +02:00
f707582570
Add missing custom status in example
...
Closes gh-9256
2017-05-18 13:26:39 +02:00
cdf5f6e0ee
Add support for deprecation level in manual metadata
...
This commit allows to specify a deprecation level to a manual metadata
entry. The purpose of that new attribute is to distinguish cases where
the property is still bound (default) from cases where the property no
longer exists and won't be bound.
This gives the opportunity to IDEs to still show the property as an
error and offer documentation and an action to rename it if a
replacement exists.
Closes gh-9074
2017-05-15 12:39:15 +03:00
e236b71615
Move RabbitMQ Simple listener support to dedicated namespace
...
Move `spring.rabbitmq.listener.*` to `spring.rabbitmq.listener.simple.*`
in preparation for Spring AMQP 2.0 that supports different container
types.
Closes gh-9108
See gh-9055
2017-05-05 10:03:47 +02:00
81e3b392c3
Merge branch '1.4.x' into 1.5.x
2017-05-04 10:42:03 +02:00
e8f99dc01c
Fix typo
...
Closes gh-9082
2017-05-04 10:41:21 +02:00
54a8dc5b33
Merge branch '1.4.x' into 1.5.x
2017-05-03 09:11:37 +02:00
e2b209e409
Polish "Clarify and re-organize docs on caching"
...
Closes gh-9065
2017-05-03 09:10:47 +02:00
11feb75752
Clarify and re-organize docs on caching
...
See gh-9065
2017-05-03 09:01:45 +02:00
652a5e7baa
Merge branch '1.4.x' into 1.5.x
2017-05-02 12:13:44 +02:00
f060922350
Fix cache example in the doc
...
Closes gh-8983
2017-05-02 11:58:50 +02:00
9768b0a8c2
Next Development Version
2017-04-21 08:32:01 +00:00
d719d2cbbc
Next Development Version
2017-04-20 12:46:19 +00:00
14638e67bc
Extended PropertiesLauncher class location logic
...
Update `PropertiesLauncher` so that classes can be loaded outside of
`BOOT-INF/classes`. You can use a subdirectory, or the root directory
of an external jar (but not the parent archive to avoid issues
with agents and awkward delegation models).
Fixes gh-8480
Closes gh-8486
2017-04-19 22:18:12 -07:00
2a7fd5011d
Clarify docs on actuator security
...
Closes gh-8646
2017-04-19 15:32:02 -07:00
8c21e16cf1
Add reference to Infinispan starter
...
Closes gh-8592
2017-04-14 13:57:47 +02:00
b3c8511fb6
Merge branch '1.4.x' into 1.5.x
2017-04-13 10:24:07 +02:00
4fd9a8c468
Add missing spring.datasource.xa properties in the appendix
...
Closes gh-8895
2017-04-13 10:23:44 +02:00
584b61ecc1
Remove deprecated property
2017-04-12 16:16:19 +02:00
f4ab574ea1
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:46:43 +02:00
072160863a
Add a note about transactional tests and `webEnvironment`
...
Closes gh-8232
2017-04-12 11:46:06 +02:00
68c90b24c2
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:15:51 +02:00
40f4c89602
Document list merge restrictions with YAML
...
Closes gh-6911
2017-04-12 11:15:24 +02:00
d301d0f4c3
Merge branch '1.4.x' into 1.5.x
2017-04-11 20:42:48 -07:00
758ddcd420
Polish
2017-04-11 20:17:23 -07:00
2ef318c00d
Polish "Add the ability to disable the trace filter"
...
Closes gh-8650
2017-04-11 14:46:57 +02:00
3f883f1898
Merge branch '1.4.x' into 1.5.x
2017-04-11 09:38:11 +02:00
404bb2d171
Polish
...
See gh-8879
2017-04-11 09:37:22 +02:00
a132bd141f
Merge branch '1.4.x' into 1.5.x
2017-04-10 16:13:53 +02:00
0a55e3e736
Polish "Clarify edge case docs on ConditionalOnClass"
...
Closes gh-8185
2017-04-10 16:12:11 +02:00
08f8219248
Clarify edge case docs on ConditionalOnClass
...
When used as a meta-annotation the value() attribute of
@ConditionalOnClass will fail silently resulting in the @Conditional
nature of the annotation being ignored.
See gh-8185
2017-04-10 15:58:17 +02:00
2d930fd653
Merge branch '1.4.x' into 1.5.x
2017-04-10 15:54:34 +02:00
a8860ba7e9
Clarify use of `@TestConfiguration`
...
As `@TestComponent` is an implementation detail at this point really, this
commit removes any reference to it from the doc.
Closes gh-8421
2017-04-10 15:54:08 +02:00
d8d36255af
Merge branch '1.4.x' into 1.5.x
2017-04-10 14:02:51 +02:00
fd53945fe0
Polish "Document HTTP response format of health endpoint"
...
Closes gh-8703
2017-04-10 14:01:50 +02:00
1fa1ed2b28
Document HTTP response format of health endpoint
...
Add HTTP response format details for health endpoint, including default
status codes and sample responses.
See gh-8703
2017-04-10 13:51:07 +02:00
fffb53ccf5
Fix neo4j embedded documentation
...
The neo4j embedded driver no longer embeds the neo4j kernel and users are
expected to add that dependency manually. We don't provide dependency
management for any of them so this commit updates the documentation to
refers to the official documentation.
Closes gh-8567
2017-04-07 10:04:41 +02:00
ad38776de3
Polish
2017-04-04 09:48:10 -07:00
ddcb5ee328
Polish
2017-04-04 09:36:27 -07:00
df6167dd71
Merge branch '1.4.x' into 1.5.x
2017-04-04 17:02:58 +01:00
9374020b0e
Stop -> from being replaced with → as the latter renders as # in PDF
...
Closes gh-8575
2017-04-04 17:00:16 +01:00
d8e90af3bf
Merge branch '1.4.x' into 1.5.x
2017-03-28 10:27:14 +02:00
cc30adf0df
Fix propdeps-plugin url in doc
...
Closes gh-8678
2017-03-28 10:15:43 +02:00
49b8d8c482
Polish
...
See gh-8698
2017-03-28 10:05:33 +02:00
aa25bfb0e0
Clarify the effect that management.context-path has on endpoint paths
...
Fixes gh-8586
2017-03-23 16:12:48 -07:00
cb38546d8a
Document default trace includes
...
Closes gh-8654
2017-03-23 15:36:27 -07:00
ddd8d03a2a
Fix typo in doc
...
Closes gh-8658
2017-03-18 07:39:16 +01:00
84dea5264f
Merge branch '1.4.x' into 1.5.x
2017-03-17 09:57:52 +01:00
0ca07fbdc3
Polish contribution
...
Closes gh-8594
2017-03-17 09:56:45 +01:00
36b28540ee
Fix invalid security example in doc
...
Closes gh-8580
2017-03-17 09:51:08 +01:00
cc79f6d83d
Merge branch '1.4.x' into 1.5.x
2017-03-15 14:52:19 +01:00
f72e0c08df
Add a note to ActiveMQ pooling in the doc
...
Closes gh-8598
2017-03-15 14:51:55 +01:00
cd8684499d
Polish
...
See gh-8621
2017-03-15 08:57:24 +01:00
6be2cc30d3
Merge branch '1.4.x' into 1.5.x
2017-03-15 08:54:21 +01:00
bc157d5b4f
Polish
...
See gh-8621
2017-03-15 08:50:50 +01:00
6a137260c1
Merge branch '1.4.x' into 1.5.x
2017-03-12 08:44:18 +01:00
4158a6d50f
Fix typo
...
Closes gh-8574
2017-03-12 08:43:51 +01:00
f8bf05b91f
Polish contribution
...
Closes gh-8474
2017-03-10 10:20:48 +01:00
0ddaca57fb
Add Tomcat Access Log's fileDateFormat property
...
Closes gh-8396
2017-03-10 09:57:00 +01:00
feb1ab375f
Merge branch '1.4.x' into 1.5.x
2017-03-10 09:36:55 +01:00
251090b1e5
Add missing spring-data-cassandra metadata
...
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.
Closes gh-8562
2017-03-10 09:34:19 +01:00
544c73841d
Merge branch '1.4.x' into 1.5.x
2017-03-10 09:22:32 +01:00
633e75dce2
Fix typo
...
Closes gh-8563
2017-03-10 09:22:00 +01:00
207ab3ecb4
Merge branch '1.4.x' into 1.5.x
2017-03-09 18:21:40 +01:00
07c56c60ba
Make sure Hazelcast bootstraps before any JCache setup
...
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.
Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).
Closes gh-8484
2017-03-09 17:59:20 +01:00
d23fa24340
Next Development Version
2017-03-03 16:18:26 +00:00
2a83e80a9b
Next Development Version
2017-03-03 14:39:21 +00:00
bb8800a625
Deprecate spring.cache.hazelcast.config
...
The additional configuration for an `HazelcastInstance` will be removed
in 2.0. This commit makes sure that the property is deprecated in 1.5
See gh-8470
2017-03-03 10:30:06 +01:00
6673d8eebc
Polish "Allow loader.path to refer to nested jars"
...
Closes gh-8334
Closes gh-8465
2017-03-02 17:29:45 +00:00
b36c8a7c24
Polish "Tighten up PropertiesLauncher's contract"
...
See gh-8346
Closes gh-7221
2017-03-02 11:19:48 +00:00
e4c807b884
Tighten up PropertiesLauncher's contract
...
The main changes are:
- Switch to `loader.properties` instead of `application.properties`
- Search for `loader.properties` in `loader.home` as well as in
the classpath
- Placeholder replacements in MANIFEST.MF (using `loader.properties`
or system/env vars)
See gh-7221
Closes gh-8346
2017-03-02 11:19:48 +00:00
b5b69cca03
Merge branch '1.4.x' into 1.5.x
2017-03-02 09:55:29 +01:00
09205a8fc8
Fix indentation
...
Closes gh-8143
2017-03-02 09:54:34 +01:00
f50a0f9707
Clarify usage of @ImportResource in doc
...
See gh-8143
2017-03-02 09:54:26 +01:00
fa4ecff9e0
Update doc about constructor injection
...
Closes gh-8392
2017-02-28 15:57:57 +01:00
ca1540cefe
Update header copyright for changed files
2017-02-27 20:41:18 -08:00
47fd5f4fac
Merge branch '1.4.x' into 1.5.x
2017-02-27 14:00:46 -08:00
47b00c086c
Polish
2017-02-27 13:56:17 -08:00
f032d2fe03
Polish
...
Closes gh-8412
2017-02-26 23:18:48 +01:00
43a534f4ca
Polish contribution
...
Closes gh-8195
2017-02-20 14:03:07 +01:00
a5a2c04d23
Fix version of `gradle-git-properties` in doc
...
Closes gh-8273
2017-02-19 16:41:28 +01:00
121ab0a71e
Merge branch '1.4.x' into 1.5.x
2017-02-17 10:32:49 +01:00
1c8f1c709c
Fix audit events related documentation
...
Closes gh-8319
2017-02-17 10:30:07 +01:00
d4d45a1009
Merge branch '1.4.x' into 1.5.x
2017-02-15 17:24:04 +01:00
0f5fefd561
Fix a broken AsciiDoc attribute declaration
...
Closes gh-8300
2017-02-15 17:23:33 +01:00
7920543480
Add note regarding the detection of `spring.jpa.database`
...
Closes gh-8253
2017-02-14 15:16:17 +01:00
6993854c55
Explain how to downgrade to Jackson 2.6
...
Closes gh-8192
2017-02-14 13:31:57 +01:00
bd6d1b74c0
Merge branch '1.4.x' into 1.5.x
2017-02-13 10:08:51 +01:00
bcbcb9c00b
Clarify use of `DataSource` for batch apps
...
Closes gh-8271
2017-02-13 10:08:40 +01:00
6c4013249b
Merge branch '1.4.x' into 1.5.x
2017-02-12 13:59:19 +01:00
58a4f04962
Fix typo in documentation
...
Closes gh-8259
2017-02-12 13:59:04 +01:00
aa49468171
Allow to define a custom MessageRecoverer
...
This commit improves `SimpleRabbitListenerContainerFactoryConfigurer` to
use a custom `MessageConverter`. If such a bean is present, it is used
for the default factory that is auto-configured.
Closes gh-8194
2017-02-09 10:43:03 +01:00
aff50f6787
Merge branch '1.4.x' into 1.5.x
2017-02-08 14:32:45 +01:00
f46e3dc9f3
Fix link in doc to Spring Test
...
Closes gh-8226
2017-02-08 14:31:42 +01:00
64b65e1fe5
Merge branch '1.4.x' into 1.5.x
2017-02-08 09:44:04 +00:00
30074431a7
Improve documentation of static resource reloading with devtools
...
Closes gh-5133
Closes gh-7886
2017-02-08 09:43:31 +00:00
d42a54e880
Add explicit note about Mockito 2 in the documentation
...
Closes gh-8217
2017-02-07 16:35:16 +01:00
130e0808d0
Merge branch '1.4.x' into 1.5.x
2017-02-07 16:31:02 +01:00
570b0593a6
Document SMTP timeout settings
...
Closes gh-8213
2017-02-07 16:22:03 +01:00
008aef6142
Document @LiquibaseDataSource feature
...
Closes gh-8214
2017-02-07 16:16:19 +01:00
3d1f8aa8d7
Merge branch '1.4.x' into 1.5.x
2017-02-05 09:25:48 +01:00
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
22ba7b93b2
Fix pid properties link in documentation
...
See gh-8196
2017-02-05 09:14:01 +01:00
846994e498
Polish
...
Closes gh-8148
2017-02-01 09:07:47 +01:00
8a0f8cf953
Merge branch '1.4.x' into 1.5.x
2017-02-01 08:57:07 +01:00
b9ede6b281
Polish contribution
...
Closes gh-8157
2017-02-01 08:56:22 +01:00
a1c601ca28
Update copyright header
...
See gh-8157
2017-02-01 08:55:36 +01:00
5c12500366
Next Development Version
2017-01-30 20:10:13 +00:00
a2696bf873
Next Development Version
2017-01-30 11:40:24 +00:00
14bd404b71
Document AWS Elastic Beanstalk deployment
...
Update the reference documentation to include details of Amazon
Elastic Beanstalk.
Closes gh-7948
2017-01-27 17:47:59 -08:00
ed1ce140c0
Next Development Version
2017-01-26 14:20:39 +00:00
71601c3b96
Merge branch '1.4.x' into 1.5.x
2017-01-25 16:48:33 -08:00
2cf93f89f5
Polish
2017-01-25 16:45:59 -08:00
79233b019e
Fix keys format for embedded mongodb support
...
Closes gh-8102
2017-01-25 11:01:52 +01:00
265a712294
Fix keys format for embedded mongodb support
...
Closes gh-8102
2017-01-25 10:41:47 +01:00
e0de28a1f7
Polish
...
Closes gh-8076
2017-01-24 13:22:22 +01:00
4a60de78ff
Merge branch '1.4.x' into 1.5.x
2017-01-24 09:56:26 +01:00
4efa4590f8
Review doc on advanced datasource customization
...
Closes gh-7652
2017-01-24 09:55:13 +01:00
2c89d9918f
Relocate AutoConfigurations from root package
...
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.
Fixes gh-8071
2017-01-23 17:32:45 -08:00
0067082eac
Document a warning about embedded Tomcat and tmpwatch on CentOS
...
Closes gh-5009
2017-01-23 10:22:51 +00:00
68fdd49a0b
Document payload types of messages sent to metricsChannel
...
Closes gh-7790
2017-01-23 10:00:42 +00:00
bfd319755c
Merge branch '1.4.x' into 1.5.x
2017-01-20 15:45:23 +00:00
0ce7c9516a
Document how to configure test- and profile-specific Flyway migrations
...
Closes gh-2753
2017-01-20 15:44:42 +00:00
915c959a28
Polish contribution
...
Closes gh-7600
2017-01-20 16:40:48 +01:00
8648520876
Add slide test annotation for MongoDB
...
This commits adds a slice test infrastructure for MongoDB, similar to
what `@DataJpaTest` does with JPA.
By default, an embedded Mongod process is used if available.
See gh-7600
2017-01-20 16:40:47 +01:00
b19d31e067
Use a random port with embedded Mongo by default
...
This commit improves the logic of the embedded Mongo support to use a
random port if no custom port has been specified. This doesn't change
the default if the embedded support isn't active.
Closes gh-8044
2017-01-20 16:40:06 +01:00
bed545df64
Merge branch '1.4.x' into 1.5.x
2017-01-20 10:54:32 +01:00
2c5c539bf1
Document automatic scheduling of metrics export
...
Closes gh-8040
2017-01-20 10:52:55 +01:00
e5e497ec3a
Document `@ImportAutoConfiguration#exclude`
...
Closes gh-7862
2017-01-19 16:47:07 +01:00
ecafd384b7
Merge branch '1.4.x' into 1.5.x
2017-01-19 16:19:53 +01:00
a852c49edd
Fix closing parentheses
...
Closes gh-8030
2017-01-19 16:19:07 +01:00
c41ff17dd7
Provide relevant default values for Enums
...
This commits adds manual metadata for enums that have a default value
since the annotation processor is not able to detect that yet.
Closes gh-7890
2017-01-19 13:19:13 +01:00
10dbf3c571
Use `@Validated` as trigger for JSR-330 validation
...
Update `ConfigurationPropertiesBindingPostProcessor` so that
`@Validated` is expected to be used to trigger JSR-330 validation.
Any existing configuration classes that use JSR-330 annotations but
don't have `@Validated` will currently still be validated, but will
now log a warning. This should give users a chance to add the requested
annotations before the next Spring Boot release where we will use them
as the exclusive signal that validation is required.
Closes gh-7579
2017-01-18 21:01:07 -08:00
ec537b307e
Make start/stop run-levels configurable in INIT-INFO of launch.script
...
See gh-7008
Closes gh-7902
2017-01-18 14:24:29 +00:00
7fa33cddd7
Merge branch '1.4.x' into 1.5.x
2017-01-17 15:00:01 +00:00
a02c2d4155
Improve the documentation of Health.Status constants
...
Closes gh-7784
2017-01-17 14:59:53 +00:00
d76e1ef95e
Merge branch '1.4.x' into 1.5.x
2017-01-17 14:44:43 +00:00
9695e0a9d1
Document breakpoint config for remote debug tunnel and IntelliJ IDEA
...
Closes gh-7732
See gh-5047
2017-01-17 14:43:38 +00:00
c71abbf6cd
Merge branch '1.4.x' into 1.5.x
2017-01-17 14:25:33 +00:00
0463350d2e
Document that spring(Profile|Property) cannot be used with scan=true
...
Closes gh-5611
2017-01-17 14:23:43 +00:00
acc36c076d
Polish
...
See gh-8004
2017-01-17 09:53:50 +01:00
ada441bccc
Allow custom override of user info OAuth2RestTemplate
...
Closes gh-5996
2017-01-16 16:09:32 +01:00
8bef0a1e60
Polish contribution
...
Closes gh-7905
2017-01-16 11:24:36 +01:00
3e05329fd7
Order internal RepositoryRestConfigurer
...
This commit provides an order of zero for the RepositoryRestConfigurer
that is used internally to configure the `RepositoryRestConfiguration`. In
practice, an unordered `RepositoryRestConfigurer` will run after ours.
Closes gh-7981
2017-01-16 10:41:44 +01:00
89e3335ca1
Merge branch '1.4.x' into 1.5.x
2017-01-16 04:00:39 -05:00
Stephane Nicoll
Madhura Bhave
Dave Syer
Spring Buildmaster
Phillip Webb
Phillip Verheyden
Luis Fernando Pollo
Andy Wilkinson
Dániel Zelei
Sola
lexandro
srichard
Eddú Meléndez
Michael J. Simons
Kazuki Shimizu
Raja Kolli
Vedran Pavic
Johnny Lim
Kamil Wozniak
zhanhb
Peter Szanto
Alessandro Falappa