Commit Graph

4212 Commits

Author SHA1 Message Date
Phillip Webb
4dbf55ea13 Pass context to ApplicationReadyEvent
Update ApplicationReadyEvent to also include the ApplicationContext.

See gh-2638
2015-03-23 09:42:12 -07:00
Phillip Webb
41a6fa9335 Merge branch '1.2.x' 2015-03-23 09:31:50 -07:00
Phillip Webb
7c9ab5ced2 Minor documentation polish 2015-03-23 09:31:08 -07:00
Stephane Nicoll
b963a82f36 Merge branch '1.2.x' 2015-03-23 11:09:52 +01:00
Stephane Nicoll
a615f8a44a Merge pull request #2698 from rtack/patch-1
* gh-2698:
  fix typo in javadoc
2015-03-23 11:09:08 +01:00
Raphael Ackermann
1235a35f2a fix typo in javadoc
{@code tomat-embedded.jar} --> {@code tomcat-embedded.jar}
2015-03-23 11:08:48 +01:00
Stephane Nicoll
c57077f174 Merge branch '1.2.x' 2015-03-22 10:09:09 +01:00
Marcel Overdijk
c0c67f2593 Update doc
Add note about escaping Spring property placeholders when using Gradle
automatic expansion.

Closes gh-2695
2015-03-22 10:07:44 +01:00
Stephane Nicoll
9820fa9c88 Remove dead code
Fixes gh-2686
2015-03-21 16:50:58 +01:00
Stephane Nicoll
6488659d40 Add link to activemq sample. 2015-03-20 08:40:31 +01:00
Andy Wilkinson
ebf68978e8 Merge branch '1.2.x' 2015-03-19 17:17:05 +00:00
Andy Wilkinson
c1eea4cf40 Ensure that a TTL of zero is honoured by HealthMvcEndpoint
See gh-2630
2015-03-19 17:16:08 +00:00
Andy Wilkinson
3b979eb828 Merge branch '1.2.x' 2015-03-19 16:23:29 +00:00
Andy Wilkinson
c849a0aba1 Cache /health response irrespective of sensitivity and security
Previously, the response from /health was not cached if the request
was secure, i.e. the user has authenticated, or the endpoint was
configured as not being sensitive. 

The commit updates HealthMvcEndpoint to apply the caching logic
all the time. Users that do not want caching can disable it by 
configuring the TTL with a value of zero.

Closes gh-2630
2015-03-19 16:23:04 +00:00
Andy Wilkinson
b1c0a7cda4 Upgrade Gradle plugin’s ID so it’s suitable for the Plugin Portal
Gradle’s plugin portal requires each plugin’s ID to be in a namespace.
Our existing ID, spring-boot, does not meet this requirement. This
commit changes the plugin’s ID to org.springframework.boot.spring-boot.
Note that, as is recommended [1], the plugin’s ID does not include
“gradle”.

See gh-1567

[1] http://plugins.gradle.org/submit
2015-03-19 14:25:07 +00:00
Andy Wilkinson
0f51a53691 Remove manual Gradle plugin versionManagement test
Following the move to using the separate dependency management plugin
this test is no longer valid. It should have been removed as part of
2c3c62d7

See gh-2133
2015-03-19 13:55:32 +00:00
Andy Wilkinson
2c3c62d71c Replace basic Gradle dependency management with use of separate plugin
This commit replaces Spring Boot's basic dependency management support
with separate dependency management plugin. This has a number of
benefits including:

1. A Maven bom can be used rather than a custom properties file
2. Dependency management is applied transitively rather than only to
   direct dependencies
3. Exclusions are applied as they would be in Maven
4. Gradle-generated poms are automatically configured with the
   appropriate dependency management

Closes gh-2133
2015-03-19 13:23:40 +00:00
Andy Wilkinson
cb067ee00c Align expectations with Spring Data REST’s new behaviour in Fowler
The response produced by Spring Data REST to a search that will always
return a single result, i.e. the return type is Foo rather than
List<Foo> or Page<Foo> has improved in Fowler. Previously, the response
would contain a single embedded resource. In Fowler, the response now
contains the resource that used to be embedded as a top-level resource.
This commit updates the expectations in one of the sample’s tests to
match this new behaviour.

See gh-2673
2015-03-18 16:16:58 +00:00
Andy Wilkinson
0e47a70f9e Upgrade to Groovy 2.4.1
Closes gh-2681
2015-03-18 14:23:31 +00:00
Andy Wilkinson
055d841eb3 Upgrade to Flyway 3.2
Closes gh-2675
2015-03-18 14:21:37 +00:00
Andy Wilkinson
9444a25de3 Merge branch '1.2.x' 2015-03-18 14:06:36 +00:00
Andy Wilkinson
0a38b9b3ab Enable the configuration of arbitrary Elasticsearch client properties
Previously, only a handful of properties could be set when
auto-configuring an Elasticsearch client. This commit introduces support
for configuring arbitrary properties using the
spring.data.elasticsearch.properties prefix. For example,
client.transport.sniff can be configured using
spring.data.elasticsearch.properties.client.transport.sniff.

Closes gh-1838
2015-03-18 14:06:11 +00:00
Andy Wilkinson
8d89f8fcea Merge branch '1.2.x' 2015-03-18 11:18:53 +00:00
Andy Wilkinson
8b20403c41 Use a String when referencing a class with @ConditionalOnMissingClass
Using a Class reference can cause reflection problems at runtime (see
gh-1065).

Closes gh-2674
2015-03-18 11:16:58 +00:00
Andy Wilkinson
99de71bf65 Upgrade to Jackson 2.5.1
Closes gh-2332
2015-03-18 10:02:10 +00:00
Stephane Nicoll
11a1bc93c4 polish ApplicationReadyEvent
Rework 7b2b11903a so that it is more aligned with others spring
application events. Fix the package tangle by moving the publication part
to EventPublishingRunListener.

Closes gh-2638
2015-03-18 10:03:32 +01:00
Andy Wilkinson
81d25a5705 Upgrade to Spring Data Fowler RC1 2015-03-17 17:22:41 +00:00
Dave Syer
2105be2358 Merge branch '1.2.x' 2015-03-17 16:29:59 +00:00
Dave Syer
c153c4e517 Make tomcat provided in a war sample 2015-03-17 16:28:22 +00:00
Andy Wilkinson
b2a68d700f Merge branch '1.2.x' 2015-03-17 11:49:03 +00:00
Andy Wilkinson
89b4cac8b0 Allow Elasticsearch client-transport-sniff to be configured via the env
Previously, a TransportClient sniff property could not be configured
while using Spring Boot’s Elasticsearch auto-configuration. This commit
adds a new property, spring.data.elasticsearch.client-transport-sniff,
that can be used to configure the TransportClient while continuing to
use the auto-configuration support.

Closes gh-1838
2015-03-17 11:48:55 +00:00
Andy Wilkinson
dd35718608 Merge branch '1.2.x' 2015-03-17 11:28:03 +00:00
Andy Wilkinson
b82e220008 Polish spring-boot-features
Wrap at 90 chars more consistently
2015-03-17 11:26:44 +00:00
izeye
a4be4670c3 Polish the documentation
Closes gh-2570
2015-03-17 11:00:31 +00:00
Andy Wilkinson
91ee9df7cb Merge branch '1.2.x' 2015-03-17 10:40:49 +00:00
Andy Wilkinson
40fd0dce3c Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-17 10:40:40 +00:00
Andy Wilkinson
1fba81e4ba Upgrade Spring Security 3.2.6.RELEASE
Closes gh-2582
2015-03-17 10:39:40 +00:00
Stephane Nicoll
629ec3d161 Merge pull request #2527 from eddumelendez/gh-2375
* gh-2375:
  add spring-boot-sample-activemq
2015-03-17 11:12:26 +01:00
Eddú Meléndez
3bd1ec680e add spring-boot-sample-activemq 2015-03-17 11:10:26 +01:00
Phillip Webb
d266639c0a Merge branch '1.2.x' 2015-03-16 23:21:23 -07:00
Phillip Webb
a717813c83 Update required Spring Framework version in docs
The actual required Spring Framework version is 4.1.5.

See gh-2575
2015-03-16 23:20:41 -07:00
Phillip Webb
cef02ae4b3 Merge branch '1.2.x' 2015-03-16 23:05:34 -07:00
Phillip Webb
cac6ad21c1 Fix WebIntegrationTest JavaDoc
The example `@Value("server.local.port")` should read
`@Value("${local.server.port}")`.

Fixes gh-2628
2015-03-16 23:04:24 -07:00
Phillip Webb
182754a582 Polish HealthIndicatorAutoConfiguration
Update HealthIndicatorAutoConfiguration to reduce the amount of
duplication in inner configuration classes.
2015-03-16 17:38:24 -07:00
Phillip Webb
4af70f1840 Polish 2015-03-16 16:26:53 -07:00
Phillip Webb
c349b402e8 Merge branch '1.2.x' 2015-03-16 14:32:31 -07:00
Phillip Webb
16495d223a Polish 2015-03-16 14:11:43 -07:00
Phillip Webb
bdd61b8ec2 Merge branch '1.1.x' into 1.2.x 2015-03-16 13:51:57 -07:00
Phillip Webb
8b979fa2e6 Polish 2015-03-16 13:43:16 -07:00
Andy Wilkinson
3eec5426ad Merge branch '1.2.x' 2015-03-16 17:54:39 +00:00