Commit Graph

5742 Commits

Author SHA1 Message Date
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
Andy Wilkinson
2f791602a0 Upgrade to ActiveMQ 5.11.1
Closes gh-2662
2015-03-16 17:50:56 +00:00
Andy Wilkinson
1f40c8a9ba Tolerate breaking API changes in ActiveMQ 5.11.0
In ActiveMQ 5.11 the signature of
PooledConnectionFactory.setConnectionFactory has changed. It now takes
an Object rather than a ConnectionFactory. This change is not binary
backwards compatible so it causes a NoSuchMethodError as we compile
against 5.10.

This commit updates ActiveMQConnectionFactoryConfiguration to call
the setConnectionFactory method reflectively, looking for both the
ConnectionFactory and Object variants.

Closes gh-2640
2015-03-16 17:41:38 +00:00
Andy Wilkinson
769200c1a8 Merge branch '1.2.x' 2015-03-16 17:14:17 +00:00
Andy Wilkinson
78a00b1658 Polish EmbeddedServletContainer’s javadoc
Closes gh-2647
2015-03-16 17:14:10 +00:00
Andy Wilkinson
38b06ceb2d Merge branch '1.2.x' 2015-03-16 17:09:07 +00:00
Andy Wilkinson
fc4376145c Process CompositePropertySources before EnumerablePropertySources
PropertySourcePropertyValues tries to process a PropertySource first
as an EnumerablePropertySource and then as a CompositePropertySource.
In Spring 4.1.2 CompositePropertySource was updated to extend
EnumerablePropertySource. This change meant that a
CompositePropertySource would always be processed as an
EnumerablePropertySource.

This commit updates PropertySourcePropertyValues to process a
PropertySource as a CompositePropertySource first and to then try it
is an EnumerablePropertySource.

Fixes gh-2608
2015-03-16 17:07:21 +00:00
Dave Syer
5aab484e11 Merge 1.2.x to pick up DataSourceInitializer changes 2015-03-16 09:20:54 +00:00
Dave Syer
f1ecf53495 Delay instantiation of DataSource as late as possible
Unfortunately it still has to happen in a @PostConstruct (otherwise
JPA never sees the schema in time), but we can delay a bit by not
using @Autowired. Appears to fix the Spring Cloud problem
(https://github.com/spring-cloud/spring-cloud-config/issues/105).

Fixes gh-2658
2015-03-16 09:18:00 +00:00
Stephane Nicoll
3ecf512ab3 Fix documentation
Add `create` as a valid values for `spring.jpa.hibernate.ddl-auto`

Fixes gh-2641
2015-03-13 17:30:05 +01:00
Stephane Nicoll
7b2b11903a Add ApplicationReadyEvent
Add an event that indicates the Spring Application has fully started and
is now ready to service requests. While ContextRefreshEvent provides
such hook for a regular spring application, this dedicated event is
triggered once all callbacks have been processed and right before the
context is returned to the caller. Besides, such event is triggered once
per application, regardless of the number of (child) contexts that could
have been created.

Closes gh-2638
2015-03-12 09:23:29 +01:00
Stephane Nicoll
bfee98e1f3 Add JMS health indicator
Define an additional health indicator for each ConnectionFactory instance
defined in the context. Extracts the provider name from the connection
meta-data.

Fixes gh-2016
2015-03-10 13:38:19 +01:00
Stephane Nicoll
9094706f6a polish 2015-03-10 13:37:37 +01:00
Stephane Nicoll
2c0d86f794 Merge pull request #2617 from joshiste/health-javamail
* health-javamail:
  Add mail health check
2015-03-10 10:34:58 +01:00
Johannes Stelzer
cd8c3d7327 Add mail health check
Define an additional health indicator for each JavaMailSenderImpl
instance in the context.

Closes gh-2017 and gh-2617
2015-03-10 10:17:33 +01:00
Stephane Nicoll
efd053a9d6 Merge branch '1.2.x' 2015-03-10 08:21:38 +01:00
Eric Dahl
018310e478 Fix broken link in docs 2015-03-10 08:21:21 +01:00
Stephane Nicoll
7c6ee8713a Merge pull request #2618 from ericdahl/docs-broken-link
* docs-broken-link:
  Fix broken link in docs
2015-03-09 08:12:43 +01:00
Eric Dahl
47b6d9588c Fix broken link in docs 2015-03-08 14:40:27 -07:00
Maciej Walkowiak
f05769dcc5 Add auto-configuration for SendGrid's client
Closes gh-2160
Closes gh-2280
2015-03-05 16:09:56 +00:00
izeye
33a92caad6 Provide dependency management for logback-access
Closes gh-2550
2015-03-05 15:39:07 +00:00