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
e9b7c7afd2
Merge branch '1.5.x'
2017-04-12 16:17:58 +02:00
584b61ecc1
Remove deprecated property
2017-04-12 16:16:19 +02:00
eeed3a841c
Review configuration properties appendix
2017-04-12 16:03:35 +02:00
abe3dba4b9
Merge branch '1.5.x'
2017-04-12 11:46:59 +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
01089c5f7a
Merge branch '1.5.x'
2017-04-12 11:16:10 +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
c4cba6b0ea
Merge branch '1.5.x'
2017-04-11 21:07:51 -07: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
158b3dae16
Merge branch '1.5.x'
2017-04-11 14:57:19 +02:00
2ef318c00d
Polish "Add the ability to disable the trace filter"
...
Closes gh-8650
2017-04-11 14:46:57 +02:00
0cd1285aa4
Polish
...
Closes gh-8879
2017-04-11 09:41:33 +02:00
5b92a0278b
Merge branch '1.5.x'
2017-04-11 09:41:08 +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
2bdbe343df
Merge branch '1.5.x'
2017-04-10 16:14:13 +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
b099471df3
Merge branch '1.5.x'
2017-04-10 15:54:53 +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
b3bcecc988
Merge branch '1.5.x'
2017-04-10 14:04:11 +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
2d169d526a
Merge branch '1.5.x'
2017-04-07 10:05:40 +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
8d921d49aa
Fix typos in new Gradle plugin
...
Closes gh-8818
2017-04-05 12:29:52 +01:00
2de7e9c310
Merge branch '1.5.x'
2017-04-04 10:07:38 -07:00
ad38776de3
Polish
2017-04-04 09:48:10 -07:00
ddcb5ee328
Polish
2017-04-04 09:36:27 -07:00
395db8711c
Merge branch '1.5.x'
2017-04-04 17:03:13 +01: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
01166381a0
Provide separate documentation (API and reference) for Gradle plugin
2017-04-04 15:33:27 +01:00
78845fe63a
Switch default value of spring.aop.proxy-target-class
...
This commit ensures that the default proxying value matches the opinion we
have applied for `@EnableTransactionManagement`
Closes gh-8786
2017-04-04 17:27:00 +03:00
b08016f15a
Polish "Add @DataNeo4jTest" contribution
...
Closes gh-8618
2017-04-02 12:38:24 +02:00
1ed5108639
Update doc for add-application-context-header
...
Closes gh-8791
2017-04-01 11:27:42 +02:00
ff50331168
Merge branch '1.5.x'
2017-03-28 10:27:31 +02: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
ee0a151671
Merge branch '1.5.x'
2017-03-28 10:05:47 +02:00
49b8d8c482
Polish
...
See gh-8698
2017-03-28 10:05:33 +02:00
d322d8613b
Upgrade to Flyway 4.1.2
...
Closes gh-8752
2017-03-25 20:41:43 +00:00
bbde6de95b
Fix syntax in doc
...
Closes gh-8688
2017-03-25 14:29:50 +00:00
2fd51dd8a1
Upgrade to Spring REST Docs 1.2.0.RC1
...
Closes gh-8716
2017-03-24 21:12:21 +00:00
30eae8a47d
Merge branch '1.5.x'
2017-03-23 16:14:32 -07:00
aa25bfb0e0
Clarify the effect that management.context-path has on endpoint paths
...
Fixes gh-8586
2017-03-23 16:12:48 -07:00
6ad46db944
Merge branch '1.5.x'
2017-03-23 16:10:35 -07:00
cb38546d8a
Document default trace includes
...
Closes gh-8654
2017-03-23 15:36:27 -07:00
25bf4a14cd
Start building against Neo4j OGM 3.0.0 snapshots
...
This commit our Neo4j OGM dependency with the Spring Data Neo4j
snapshots that are currently included in snapshots of Spring Data Kay.
It switches to using Neo4j's Bolt driver by default, aligning it with
the default of the latest Spring Data Neo4j 5 snapshots.
It also contains a workaround for a Neo4j OGM issue [1] and a change
to Neo4jDataAutoConfigurationTests that prevents the entire classpath
from being scanned.
See gh-8687
[1] https://github.com/neo4j/neo4j-ogm/issues/340
2017-03-22 15:24:49 +00:00
b8527d7060
Merge branch '1.5.x'
2017-03-18 07:40:11 +01:00
ddd8d03a2a
Fix typo in doc
...
Closes gh-8658
2017-03-18 07:39:16 +01:00
2f8f400a63
Merge branch '1.5.x'
2017-03-17 09:58:09 +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
883dd5802b
Merge branch '1.5.x'
2017-03-15 14:52:37 +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
1b395ddd9d
Merge branch '1.5.x'
2017-03-15 08:57:42 +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
b76ca0bf8f
Restructure web auto-configuration
...
Restructure `org.springframework.boot.autoconfigure.web` to better align
with the new package structure in `spring-boot`.
Auto-configuration is now split into client, servlet and reactive
sub-packages. In addition a new `http` package now handles common
HTTP concerns.
Fixes gh-8616
2017-03-14 22:06:28 -07:00
099e188f9f
Unify WebServerFactoryCustomizers
...
Replace `ReactiveWebServerCustomizer` and `WebServerFactoryCustomizer`
with a unified `WebServerFactoryCustomizer`.
Fixes gh-8558
2017-03-14 21:43:23 -07:00
67556ba8ea
Restructure embedded web server packages
...
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:
Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server
Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter
Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server
Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded
In addition:
- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
`ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
`ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.
Fixes gh-8532
2017-03-12 21:08:25 -07:00
7b388e5865
Merge branch '1.5.x'
2017-03-12 08:44:38 +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
b35c162593
Raise the minimum supported version of Gradle to 3.4
...
Closes gh-7922
2017-03-11 09:03:06 +00:00
5ca197b5b6
Merge branch '1.5.x'
2017-03-10 10:39:00 +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
abef1ee4db
Merge branch '1.5.x'
2017-03-10 09:37:21 +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
dc3b2a70b9
Merge branch '1.5.x'
2017-03-10 09:22:46 +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
68ef19b69b
Merge branch '1.5.x'
2017-03-09 18:31:08 +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
d8f827d224
Cleanup and format code
2017-03-06 17:08:09 -08:00
425dbc3e52
Update copyright header for edited files
2017-03-06 15:04:07 -08: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
d811b5fb1d
Merge branch '1.5.x'
2017-03-03 10:31:26 +01: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
1c789f1a8d
Remove dependency management for `hibernate-entitymanager`
...
Closes gh-8433
2017-03-02 18:31:53 +01:00
9c88ba3b90
Merge branch '1.5.x'
2017-03-02 17:30:44 +00: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
b6e8a280fd
Merge branch '1.5.x'
2017-03-02 11:22:17 +00:00
b36c8a7c24
Polish "Tighten up PropertiesLauncher's contract"
...
See gh-8346
Closes gh-7221
2017-03-02 11:19:48 +00:00
Stephane Nicoll
Phillip Webb
Johnny Lim
Phillip Verheyden
Luis Fernando Pollo
Andy Wilkinson
Dániel Zelei
Kazuki Shimizu
Madhura Bhave
Sola
lexandro
srichard
Eddú Meléndez
Spring Buildmaster
Vedran Pavic