Commit Graph

21208 Commits

Author SHA1 Message Date
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
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
2014-09-03 17:58:03 -07:00
Phillip Webb
6e0b5e48bd Merge branch '1.1.x' 2014-09-03 15:04:53 -07:00
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
2014-09-03 15:01:52 -07:00
Phillip Webb
114cd444ed Merge branch '1.1.x' 2014-09-03 14:16:18 -07:00
Phillip Webb
c2ff7ca80f Add HtppClientOptions to TestRestTemplate
Allow customization of the Apache HTTP Client used in TestRestTemplate
via an options enum.

Fixes gh-1497
2014-09-03 14:15:47 -07:00
Phillip Webb
6f62fc854b Merge branch '1.1.x' 2014-09-03 11:45:54 -07:00
Phillip Webb
bedb44adc8 Ensure non-remapped calls are still logged
Update LevelRemappingAppender to that any calls that aren't remapped
are still logged.

Fixes gh-1481
2014-09-03 11:45:09 -07:00
Stephane Nicoll
f46fe32264 Add group discriminant in case of conflict
Prior to this commit, the repackage goal silently ignored the case of
two libraries having the same name and version but a different group.
As a result, the second library was overwriting the first one in the
repackaged jar.

This commit adds support for custom Library names and updates the
Maven and Gradle plugins so that the name includes the group ID
when there would otherwise be a duplicate.

Fixes gh-1475
2014-09-03 11:22:53 -07:00
Phillip Webb
449752c9e2 Minor asciidoctor formatting 2014-09-03 08:38:31 -07:00
Stephane Nicoll
383288f1c2 Merge branch '1.1.x' 2014-09-03 16:32:24 +02:00
Stephane Nicoll
811f5ab80c Clarify the use of spring.profiles
Fixes gh-1470
2014-09-03 16:30:55 +02:00
Phillip Webb
236026a43a Support mixed XA/non-XA ConnectionFactory beans
Update ActiveMQ and HornetQ XA configurations to also expose non-xa
ConnectionFactory variants.

Fixes gh-1461
2014-09-02 13:00:59 -07:00
Phillip Webb
57a154520e Drop min/max DataSourcePool metrics 2014-09-02 09:54:16 -07:00
Stephane Nicoll
a98c7613bf Merge branch '1.1.x' 2014-09-02 15:55:13 +02:00
Stephane Nicoll
9a8d05bd43 Clarify addResources parameter description
This commit clarifies the role of the 'addResources' flag and makes
it explicit that any duplicate found in the target directory are
actually removed

Fixes gh-1479
2014-09-02 15:54:40 +02:00
Stephane Nicoll
e11327719e Merge branch '1.1.x' 2014-09-02 15:45:01 +02:00
Stephane Nicoll
f48628fa90 Workaround fix for git-commit-plugin
This commit is a workaround until git-commit-id-plugin 2.1.11 is
released. See also issue 124 of that project

Fixes gh-1484
2014-09-02 15:44:24 +02:00
Phillip Webb
104b724446 Fix Windows Atomikos/Bitronix ApplicationTests
Update SampleAtomikosApplicationTests and SampleBitronixApplicationTests
to not depend on any specific System.out order.

Fixes gh-1472
2014-09-01 17:46:52 -07:00
Phillip Webb
ba5c3526da Merge branch '1.1.x' 2014-09-01 17:21:00 -07:00
Phillip Webb
34cbcf5e50 Support better HttpMessageConverters manipulation
Add additional constructor and a protected postProcessConverters method
to make it easier to manipulate the final converter list that will
be used.

Fixes gh-1482
2014-09-01 17:18:51 -07:00
Phillip Webb
5774e808c7 Fix HornetQ ClassNotFound issues when not embedded
Update HornetQConnectionFactoryConfiguration and
HornetQXAConnectionFactoryConfiguration so that they no longer depend
on the HornetQ EmbeddedJMS class. EmbeddedJMS beans are started
(when possible) from the HornetQConnectionFactoryFactory.

Fixes gh-1480
2014-09-01 14:08:52 -07:00
Phillip Webb
c8809afe1b Polish 2014-09-01 13:11:37 -07:00
Phillip Webb
2262a3baa7 Polish DataSource metrics 2014-09-01 12:53:42 -07:00