Commit Graph

2976 Commits (9c339740048ce75cb460ded13feb492f5411b779)
 

Author SHA1 Message Date
Andy Wilkinson 9c33974004 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 750c116078 Upgrade to Spring Integration 4.0.4 and Spring AMQP 1.3.6
Closes gh-1503
Closes gh-1505
10 years ago
Josh Long 14948c83f5 Add smarter getParentLogger that works on Java 6 and Java 7+
Fixes gh-1518
Closes gh-1519
10 years ago
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
10 years ago
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
10 years ago
Andy Wilkinson dde7ebf30f Merge branch '1.1.x' 10 years ago
John Tims a4e08beebc Add missing variable to the example in the Loading YAML section
Closes gh-1524
10 years ago
Andy Wilkinson 3a1e631ac8 Merge branch '1.1.x' 10 years ago
Christoph Frick 3b07e4e633 Fix typos in the documentation: though -> through
Closes gh-1510
10 years ago
Christoph Frick 5455b42d32 Fix typos in the documentation: though -> through
Closes gh-1510
10 years ago
David Liu 8e9e502b6a Add support for auto-configuration of Commons DBCP2
Closes gh-1292
Closes gh-1477
10 years ago
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
10 years ago
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
10 years ago
Andy Wilkinson 85ebc29639 Upgrade to latest Spring Integration and AMQP milestones
Closes gh-1493
Closes gh-1517
10 years ago
Dave Syer b8f820d711 Merge branch '1.1.x' 10 years ago
Dave Syer 9a2f9825d1 Fix asciidoc syntax 10 years ago
Dave Syer 993c7691ec Fix recommended authentication configuration to match samples 10 years ago
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
10 years ago
Phillip Webb 84249da941 Add @ConditionalOnBean to Thymeleaf dialect beans
Fixes gh-1507
10 years ago
Phillip Webb 338288205b Fixup version numbers following release 10 years ago
Spring Buildmaster d63e4b4329 Next development version 10 years ago
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
10 years ago
Phillip Webb 8bf1f9567a Apply eclipse formatting and cleanup rules 10 years ago
Phillip Webb 9cc893cd35 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
10 years ago
Phillip Webb eaa3bd040d Apply eclipse formatting rules 10 years ago
Andy Wilkinson ad8be26efd Merge branch '1.1.x' 10 years ago
Andy Wilkinson 990213b8b8 Correct reference to ConfigurableEmbeddedServletContainerFactory
Closes gh-1500
10 years ago
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
10 years ago
Stephane Nicoll 2d8ec0faab Upgrade to Spring framework 4.1.0
Fixes gh-1501
10 years ago
Dave Syer 7141ceaff7 Fix versions in simple sample on merge 10 years ago
Dave Syer 73a5a8730b Fix versions in simple sample 10 years ago
Stephane Nicoll 36c1bcc144 Merge branch '1.1.x' 10 years ago
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
10 years ago
Stephane Nicoll 3f148683a1 Update to Spring framework 4.0.7
Fixes gh-1488
10 years ago
Dave Syer fea9ee8faa Merge branch '1.1.x' 10 years ago
Dave Syer 8a66d50edf Remove binary files 10 years ago
Phillip Webb e008262238 Merge pull request #1385 from ramnivas/spring-cloud-starters
* spring-cloud-starters:
  Add starter for spring-cloud
10 years ago
Ramnivas Laddad 413890de48 Add starter for spring-cloud
Fixes gh-1385
10 years ago
Phillip Webb 9a1c15a88d Upgrade to spring-cloud v1.1.0 10 years ago
Phillip Webb 5da3179309 Add spring-messaging to the websocket starter
Fixes gh-1241
10 years ago
Phillip Webb 35a840a396 Replace mavenCentral() with jcenter() in docs
Fixes gh-1373
10 years ago
Phillip Webb 1697174cd8 Remove ExtendedPathMatchingResourcePatternResolver
Remove ExtendedPathMatchingResourcePatternResolver which is not required
with Spring 4.1

Fixes gh-1420
10 years ago
Phillip Webb d4ad29782d Add spring.provides for JTA starters
Fixes gh-1452
10 years ago
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
10 years ago
Phillip Webb 6ee18fbabd Remove workaround for SPR-12118 10 years ago
Phillip Webb 0326abfe01 Support for composed "any" condition
Add `AnyNestedCondition` which can be used to create a logical 'or' of
other conditions contained on nested classes. For example:

	static class OnJndiOrProperty extends AnyNestedCondition {

		@ConditionalOnJndi()
		static class OnJndi {
		}

		@ConditionalOnProperty("something")
		static class OnProperty {
		}

	}

Fixes gh-1490
10 years ago
Phillip Webb 6e0b5e48bd Merge branch '1.1.x' 10 years ago
Phillip Webb 7e6bad8d4b Fix @ActiveProfile to override existing profiles
Change SpringApplicationContextLoader to set active profiles using the
`spring.profiles.active` environment property rather than calling
`SpringApplication.setAdditionalProfiles`. This allows @ActiveProfiles
to replace existing profiles rather than add to them which is consistent
with the Spring TestContext Framework.

Fixes gh-1469
10 years ago
Phillip Webb 114cd444ed Merge branch '1.1.x' 10 years ago
Phillip Webb c2ff7ca80f Add HtppClientOptions to TestRestTemplate
Allow customization of the Apache HTTP Client used in TestRestTemplate
via an options enum.

Fixes gh-1497
10 years ago