Commit Graph

23481 Commits

Author SHA1 Message Date
Dave Syer
0950072b5e Fix integration test (shared context by accident) 2014-09-12 16:03:22 -05:00
Vladimir Tsanev
258c6f116a Add store type and store provider properties to SSL configuration
Closes gh-1545
2014-09-12 14:50:06 -05:00
Stephane Nicoll
037e3a4221 Fix typo in documentation
Fixes gh-1527
2014-09-12 12:22:23 -05:00
Andy Wilkinson
b146e76b63 Merge branch '1.1.x' 2014-09-07 18:27:23 -05:00
Andy Wilkinson
06ffd9dd86 Fix configuration of Spring Loaded on Gradle 1.6
The applicationDefaultJvmArgs property was added in Gradle 1.7. This
commit updates RunPluginFeatures to access the property defensively
so that the plugin can be used with Gradle 1.6.

Fixes gh-1511
2014-09-07 18:23:16 -05:00
Andy Wilkinson
9c33974004 Merge branch '1.1.x' 2014-09-07 17:33:38 -05:00
Andy Wilkinson
750c116078 Upgrade to Spring Integration 4.0.4 and Spring AMQP 1.3.6
Closes gh-1503
Closes gh-1505
2014-09-07 17:32:09 -05:00
Josh Long
14948c83f5 Add smarter getParentLogger that works on Java 6 and Java 7+
Fixes gh-1518
Closes gh-1519
2014-09-07 17:25:30 -05:00
Christoph Strobl
c8a4891441 Add support for Redis Sentinel configuration
Spring Data Redis 1.4.0 introduced Redis Sentinel support. When
specified, RedisConnectionFactory uses the Sentinel configuration to
determine the current master.

Sentinel configuration can be specified using two new properties:
spring.redis.sentinel.master and spring.redis.sentinel.nodes.

For example:

spring.redis.sentinel.master=mymaster # name of redis server
spring.redis.sentinel.nodes=127.0.0.1:26379,127.0.0.1:26380

Alternatively, a bean of type RedisSentinelConfiguration can be declared
and it will be used to configure the connection factory.

Note: At this time, Sentinel support is only available for Jedis

Closes gh-1337
2014-09-07 17:00:38 -05:00
Andy Wilkinson
fbeb8c966c Upgrade to Spring Data Evans
The missing bean condition on the auto-configuration classes for
Elasticsearch, Jpa, Mongo and Solr repositories have been tightened to
look for ElasticsearchRepositoryFactoryBean, JapRepositoryFactoryBean,
MonoRepositoryFactoryBean, and SolrRepositoryFactoryBean respectively.

In Spring Data Evans, when there are multiple repository types on the
classpath, a strict mode is entered to prevent the different
repositories from trampling over each other. A side-effect of this is
that for the Mongo domain types in the tests to be discovered they
must be explicitly annotated with @Document.

Closes gh-1338
2014-09-07 16:04:04 -05:00
Andy Wilkinson
dde7ebf30f Merge branch '1.1.x' 2014-09-07 15:45:53 -05:00
John Tims
a4e08beebc Add missing variable to the example in the Loading YAML section
Closes gh-1524
2014-09-07 15:43:22 -05:00
Andy Wilkinson
3a1e631ac8 Merge branch '1.1.x' 2014-09-07 11:04:16 -05:00
Christoph Frick
3b07e4e633 Fix typos in the documentation: though -> through
Closes gh-1510
2014-09-07 11:03:49 -05:00
Christoph Frick
5455b42d32 Fix typos in the documentation: though -> through
Closes gh-1510
2014-09-07 11:00:09 -05:00
David Liu
8e9e502b6a Add support for auto-configuration of Commons DBCP2
Closes gh-1292
Closes gh-1477
2014-09-07 10:43:48 -05:00
Stephane Nicoll
8ed461947f Improve RabbitMQ support in CLI
This commit deprecates the proprietary EnableRabbitMessaging annotation
in favour of the standard @EnableRabbit introduced as of Spring Rabbit
1.4.

Fixes gh-1494
2014-09-05 17:52:20 +02:00
Stephane Nicoll
02a8a9c07b Add auto configuration for Spring AMQP 1.4 features
This commit adds two additional auto-configuration items that are new
in Spring AMQP 1.4:

* A RabbitMessagingTemplate is automatically created if none is present
* A default RabbitListenerContainerFactory is automatically created if
none is present.

Besides @EnableRabbit is enabled automatically if the necessary classes
are present and a ConnectionFactory is available.

Fixes gh-1495
2014-09-05 17:52:07 +02:00
Andy Wilkinson
85ebc29639 Upgrade to latest Spring Integration and AMQP milestones
Closes gh-1493
Closes gh-1517
2014-09-05 16:44:27 +01:00
Dave Syer
b8f820d711 Merge branch '1.1.x' 2014-09-05 16:38:22 +01:00
Dave Syer
9a2f9825d1 Fix asciidoc syntax 2014-09-05 16:33:32 +01:00
Dave Syer
993c7691ec Fix recommended authentication configuration to match samples 2014-09-05 16:30:54 +01:00
Andy Wilkinson
f5ab0cf2dc Update CLI install to prefer local snapshots to those in a remote repo
Previously, InstallCommand used a custom Grape root and then walked
the tree of files downloaded by Aether to determine which files it
should install or uninstall. In some scenarios two files for the
same module would be present: one named foo-1.0.0.BUILD-SNAPSHOT.jar
and one named foo-1.0.0.BUILD-20140905.091809-2.jar. The former is
from the local repository and the later is from a remote repository.
In this case, the visitor would do the wrong thing and the latter
would be installed into lib.

This commit updates InstallCommand to determine the jars that it
should process by consulting GroovyCompiler's classpath, rather than
by walking Aether's cache. This approach selects the correct jar as
Aether has already figured this out as part of resolving the
dependency. It also brings InstallCommand into line with JarCommand.

The previous implementation used Java 7-specific File APIs. As part
of the above-described change this usage has been removed. The
install command can now be used on Java 6.

Fixes gh-1515
2014-09-05 15:36:04 +01:00
Phillip Webb
84249da941 Add @ConditionalOnBean to Thymeleaf dialect beans
Fixes gh-1507
2014-09-04 17:54:40 -07:00
Phillip Webb
338288205b Fixup version numbers following release 2014-09-04 15:40:55 -07:00
Spring Buildmaster
d63e4b4329 Next development version 2014-09-04 12:15:18 -07:00
Phillip Webb
4d27458fee Replace MongoProperties condition for spring-cloud
Replace @ConditionalOnBean(MongoProperties.class) on
MongoDataAutoConfiguration with @EnableConfigurationProperties since
MongoAutoConfiguration will not be applied in a cloud environment.

Fixes gh-1502
2014-09-04 10:41:32 -07:00
Phillip Webb
8bf1f9567a Apply eclipse formatting and cleanup rules 2014-09-04 09:49:13 -07:00
Phillip Webb
9cc893cd35 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
2014-09-04 09:41:58 -07:00
Phillip Webb
eaa3bd040d Apply eclipse formatting rules 2014-09-04 09:39:58 -07:00
Andy Wilkinson
ad8be26efd Merge branch '1.1.x' 2014-09-04 17:04:43 +01:00
Andy Wilkinson
990213b8b8 Correct reference to ConfigurableEmbeddedServletContainerFactory
Closes gh-1500
2014-09-04 17:04:38 +01:00
Andy Wilkinson
8399fc990c Verify that @EnableIntegrationMBeanExport can set custom JMX domain
Add a test to JmxAutoConfigurationTests which verifies that
@EnableIntegrationMBeanExport can be used on a @Configuration class
to customize the default domain used for MBeans created by Spring
Integration. See https://jira.spring.io/browse/SPR-12128.

Closes gh-1451
2014-09-04 16:48:52 +01:00
Stephane Nicoll
2d8ec0faab Upgrade to Spring framework 4.1.0
Fixes gh-1501
2014-09-04 14:36:27 +02:00
Dave Syer
7141ceaff7 Fix versions in simple sample on merge 2014-09-04 10:22:08 +01:00
Dave Syer
73a5a8730b Fix versions in simple sample 2014-09-04 10:20:54 +01:00
Stephane Nicoll
36c1bcc144 Merge branch '1.1.x' 2014-09-04 11:18:42 +02:00
Dave Syer
378f6b78ce Add ServiceLoader for AST transformations
The loading is via a marker interface SpringBootAstTransformation
to avoid clashing with other services registered as org.groovy.*

Fixes gh-1392
2014-09-04 10:13:09 +01:00
Stephane Nicoll
3f148683a1 Update to Spring framework 4.0.7
Fixes gh-1488
2014-09-04 11:10:33 +02:00
Dave Syer
fea9ee8faa Merge branch '1.1.x' 2014-09-04 08:51:51 +01:00
Dave Syer
8a66d50edf Remove binary files 2014-09-04 08:51:37 +01:00
Phillip Webb
e008262238 Merge pull request #1385 from ramnivas/spring-cloud-starters
* spring-cloud-starters:
  Add starter for spring-cloud
2014-09-03 19:40:47 -07:00
Ramnivas Laddad
413890de48 Add starter for spring-cloud
Fixes gh-1385
2014-09-03 19:39:16 -07:00
Phillip Webb
9a1c15a88d Upgrade to spring-cloud v1.1.0 2014-09-03 19:15:27 -07:00
Phillip Webb
5da3179309 Add spring-messaging to the websocket starter
Fixes gh-1241
2014-09-03 18:49:03 -07:00
Phillip Webb
35a840a396 Replace mavenCentral() with jcenter() in docs
Fixes gh-1373
2014-09-03 18:46:56 -07:00
Phillip Webb
1697174cd8 Remove ExtendedPathMatchingResourcePatternResolver
Remove ExtendedPathMatchingResourcePatternResolver which is not required
with Spring 4.1

Fixes gh-1420
2014-09-03 18:44:02 -07:00
Phillip Webb
d4ad29782d Add spring.provides for JTA starters
Fixes gh-1452
2014-09-03 18:42:23 -07:00
Phillip Webb
f7cffce695 Allow custom JNDI ConnectionFactory lookup
Add a `spring.jms.jndi-name` property to allow a JMS ConnectionFactory
to be obtained from a custom JNDI location.

Fixes gh-1471
2014-09-03 18:35:45 -07:00
Phillip Webb
6ee18fbabd Remove workaround for SPR-12118 2014-09-03 18:32:17 -07:00