Commit Graph

  • 389c4f3e0b Merge branch '1.1.x' Dave Syer 2014-09-13 06:44:03 -05:00
  • bf0c8fc8bb Remove JDBC from secure-web sample Dave Syer 2014-09-13 06:41:15 -05:00
  • 9902f98a3d Ensure the AuthenticationManager is created when needed Dave Syer 2014-09-12 16:03:35 -05:00
  • 0950072b5e Fix integration test (shared context by accident) Dave Syer 2014-09-12 16:03:22 -05:00
  • 258c6f116a Add store type and store provider properties to SSL configuration Vladimir Tsanev 2014-09-11 01:20:03 +03:00
  • 037e3a4221 Fix typo in documentation Stephane Nicoll 2014-09-12 12:22:23 -05:00
  • b146e76b63 Merge branch '1.1.x' Andy Wilkinson 2014-09-07 18:27:23 -05:00
  • 06ffd9dd86 Fix configuration of Spring Loaded on Gradle 1.6 Andy Wilkinson 2014-09-07 18:23:16 -05:00
  • 9c33974004 Merge branch '1.1.x' Andy Wilkinson 2014-09-07 17:33:38 -05:00
  • 750c116078 Upgrade to Spring Integration 4.0.4 and Spring AMQP 1.3.6 Andy Wilkinson 2014-09-07 17:30:17 -05:00
  • 14948c83f5 Add smarter getParentLogger that works on Java 6 and Java 7+ Josh Long 2014-09-05 10:39:38 -07:00
  • c8a4891441 Add support for Redis Sentinel configuration Christoph Strobl 2014-08-05 09:42:44 +02:00
  • fbeb8c966c Upgrade to Spring Data Evans Andy Wilkinson 2014-08-18 14:57:32 +01:00
  • dde7ebf30f Merge branch '1.1.x' Andy Wilkinson 2014-09-07 15:45:53 -05:00
  • a4e08beebc Add missing variable to the example in the Loading YAML section John Tims 2014-09-06 11:13:17 -04:00
  • 3a1e631ac8 Merge branch '1.1.x' Andy Wilkinson 2014-09-07 11:04:16 -05:00
  • 3b07e4e633 Fix typos in the documentation: though -> through Christoph Frick 2014-09-05 11:34:20 +02:00
  • 5455b42d32 Fix typos in the documentation: though -> through Christoph Frick 2014-09-05 11:34:20 +02:00
  • 8e9e502b6a Add support for auto-configuration of Commons DBCP2 David Liu 2014-09-01 16:09:46 +08:00
  • 8ed461947f Improve RabbitMQ support in CLI Stephane Nicoll 2014-09-05 15:27:46 +02:00
  • 02a8a9c07b Add auto configuration for Spring AMQP 1.4 features Stephane Nicoll 2014-09-05 14:51:51 +02:00
  • 85ebc29639 Upgrade to latest Spring Integration and AMQP milestones Andy Wilkinson 2014-09-05 16:19:12 +01:00
  • b8f820d711 Merge branch '1.1.x' Dave Syer 2014-09-05 16:38:22 +01:00
  • 9a2f9825d1 Fix asciidoc syntax Dave Syer 2014-09-05 16:33:32 +01:00
  • 993c7691ec Fix recommended authentication configuration to match samples Dave Syer 2014-09-05 16:30:27 +01:00
  • f5ab0cf2dc Update CLI install to prefer local snapshots to those in a remote repo Andy Wilkinson 2014-09-05 15:15:14 +01:00
  • 84249da941 Add @ConditionalOnBean to Thymeleaf dialect beans Phillip Webb 2014-09-04 17:54:40 -07:00
  • 338288205b Fixup version numbers following release Phillip Webb 2014-09-04 15:40:55 -07:00
  • d63e4b4329 Next development version Spring Buildmaster 2014-09-04 12:15:18 -07:00
  • 4d27458fee Replace MongoProperties condition for spring-cloud Phillip Webb 2014-09-04 10:41:32 -07:00
  • 8bf1f9567a Apply eclipse formatting and cleanup rules Phillip Webb 2014-09-04 09:49:13 -07:00
  • 9cc893cd35 Merge branch '1.1.x' Phillip Webb 2014-09-04 09:41:58 -07:00
  • eaa3bd040d Apply eclipse formatting rules Phillip Webb 2014-09-04 09:39:58 -07:00
  • ad8be26efd Merge branch '1.1.x' Andy Wilkinson 2014-09-04 17:04:43 +01:00
  • 990213b8b8 Correct reference to ConfigurableEmbeddedServletContainerFactory Andy Wilkinson 2014-09-04 17:04:38 +01:00
  • 8399fc990c Verify that @EnableIntegrationMBeanExport can set custom JMX domain Andy Wilkinson 2014-09-04 16:48:52 +01:00
  • 2d8ec0faab Upgrade to Spring framework 4.1.0 Stephane Nicoll 2014-09-04 14:36:27 +02:00
  • 7141ceaff7 Fix versions in simple sample on merge Dave Syer 2014-09-04 10:22:08 +01:00
  • 73a5a8730b Fix versions in simple sample Dave Syer 2014-09-04 10:20:27 +01:00
  • 36c1bcc144 Merge branch '1.1.x' Stephane Nicoll 2014-09-04 11:18:42 +02:00
  • 378f6b78ce Add ServiceLoader for AST transformations Dave Syer 2014-08-18 16:15:06 +01:00
  • 3f148683a1 Update to Spring framework 4.0.7 Stephane Nicoll 2014-09-04 11:10:16 +02:00
  • fea9ee8faa Merge branch '1.1.x' Dave Syer 2014-09-04 08:51:51 +01:00
  • 8a66d50edf Remove binary files Dave Syer 2014-09-04 08:51:37 +01:00
  • e008262238 Merge pull request #1385 from ramnivas/spring-cloud-starters Phillip Webb 2014-09-03 19:40:47 -07:00
  • 413890de48 Add starter for spring-cloud Ramnivas Laddad 2014-09-03 19:38:36 -07:00
  • 9a1c15a88d Upgrade to spring-cloud v1.1.0 Phillip Webb 2014-09-03 19:15:27 -07:00
  • 5da3179309 Add spring-messaging to the websocket starter Phillip Webb 2014-09-03 18:49:03 -07:00
  • 35a840a396 Replace mavenCentral() with jcenter() in docs Phillip Webb 2014-09-03 18:46:56 -07:00
  • 1697174cd8 Remove ExtendedPathMatchingResourcePatternResolver Phillip Webb 2014-09-03 18:44:02 -07:00
  • d4ad29782d Add spring.provides for JTA starters Phillip Webb 2014-09-03 18:42:23 -07:00
  • f7cffce695 Allow custom JNDI ConnectionFactory lookup Phillip Webb 2014-09-03 18:35:45 -07:00
  • 6ee18fbabd Remove workaround for SPR-12118 Phillip Webb 2014-09-03 18:32:17 -07:00
  • 0326abfe01 Support for composed "any" condition Phillip Webb 2014-09-02 14:27:33 -07:00
  • 6e0b5e48bd Merge branch '1.1.x' Phillip Webb 2014-09-03 15:04:53 -07:00
  • 7e6bad8d4b Fix @ActiveProfile to override existing profiles Phillip Webb 2014-09-03 15:01:52 -07:00
  • 114cd444ed Merge branch '1.1.x' Phillip Webb 2014-09-03 14:16:18 -07:00
  • c2ff7ca80f Add HtppClientOptions to TestRestTemplate Phillip Webb 2014-09-03 14:11:47 -07:00
  • 6f62fc854b Merge branch '1.1.x' Phillip Webb 2014-09-03 11:45:54 -07:00
  • bedb44adc8 Ensure non-remapped calls are still logged Phillip Webb 2014-09-03 11:43:28 -07:00
  • f46fe32264 Add group discriminant in case of conflict Stephane Nicoll 2014-09-03 11:16:49 -07:00
  • 449752c9e2 Minor asciidoctor formatting Phillip Webb 2014-09-03 08:38:31 -07:00
  • 383288f1c2 Merge branch '1.1.x' Stephane Nicoll 2014-09-03 16:32:24 +02:00
  • 811f5ab80c Clarify the use of spring.profiles Stephane Nicoll 2014-09-03 16:30:55 +02:00
  • 236026a43a Support mixed XA/non-XA ConnectionFactory beans Phillip Webb 2014-09-02 11:44:16 -07:00
  • 57a154520e Drop min/max DataSourcePool metrics Phillip Webb 2014-09-02 09:54:16 -07:00
  • a98c7613bf Merge branch '1.1.x' Stephane Nicoll 2014-09-02 15:55:13 +02:00
  • 9a8d05bd43 Clarify addResources parameter description Stephane Nicoll 2014-09-02 15:54:40 +02:00
  • e11327719e Merge branch '1.1.x' Stephane Nicoll 2014-09-02 15:45:01 +02:00
  • f48628fa90 Workaround fix for git-commit-plugin Stephane Nicoll 2014-09-02 15:44:24 +02:00
  • 104b724446 Fix Windows Atomikos/Bitronix ApplicationTests Phillip Webb 2014-09-01 17:45:30 -07:00
  • ba5c3526da Merge branch '1.1.x' Phillip Webb 2014-09-01 17:21:00 -07:00
  • 34cbcf5e50 Support better HttpMessageConverters manipulation Phillip Webb 2014-09-01 17:18:51 -07:00
  • 5774e808c7 Fix HornetQ ClassNotFound issues when not embedded Phillip Webb 2014-09-01 14:05:39 -07:00
  • c8809afe1b Polish Phillip Webb 2014-09-01 13:11:37 -07:00
  • 2262a3baa7 Polish DataSource metrics Phillip Webb 2014-09-01 12:53:42 -07:00
  • 5001b038cb Expose additional pool metrics Phillip Webb 2014-09-01 11:59:36 -07:00
  • 4c8d35db43 Rename CompositeDataSourcePoolMetadataProvider Phillip Webb 2014-09-01 11:38:42 -07:00
  • a512bcf766 Always auto-configure pool metadata providers Phillip Webb 2014-09-01 11:26:05 -07:00
  • 69107cb1df Create metadata sub-package Phillip Webb 2014-09-01 11:11:54 -07:00
  • e56be6cf3d DataSourceMetadata -> DataSourcePoolMetadata Phillip Webb 2014-09-01 11:06:02 -07:00
  • e17769fc2f Polish DataSourceMetrics code Phillip Webb 2014-09-01 10:40:16 -07:00
  • 169a46b1aa Rename MetricDataSourceAutoConfiguration Phillip Webb 2014-09-01 09:24:29 -07:00
  • adbded33ff Apply eclipse formatting rules to 3dc932db Phillip Webb 2014-09-01 09:20:05 -07:00
  • 53c4859a6a Reuse data source validation query in health endpoint Stephane Nicoll 2014-08-29 14:58:01 +02:00
  • 2694941b93 Fix DataSourceMetadata location Stephane Nicoll 2014-08-29 14:35:20 +02:00
  • 3dc932db88 DataSource metrics Stephane Nicoll 2014-06-12 18:41:13 +02:00
  • 85c95744f9 Avoid duplicate script Stephane Nicoll 2014-08-29 10:26:29 +02:00
  • 0dc389f5b3 1.Z -> 1.2 Phillip Webb 2014-08-28 17:57:25 -07:00
  • 505795d6c7 Update CONTRIBUTING with commit message tips Phillip Webb 2014-08-28 17:41:24 -07:00
  • 0143bec831 Polish Phillip Webb 2014-08-28 16:58:37 -07:00
  • 5b36484b10 Merge pull request #1433 from liujiong1982/spring-boot-1379 Phillip Webb 2014-08-28 16:52:15 -07:00
  • b1ceb8a43b Add database property to RedisProperties David Liu 2014-08-25 20:12:52 +08:00
  • 2186da453f Merge branch '1.1.x' Phillip Webb 2014-08-28 14:27:09 -07:00
  • 0c0a0a7738 Convert session timeout to minutes for Tomcat Phillip Webb 2014-08-28 14:24:55 -07:00
  • f8a4df0838 Polish Phillip Webb 2014-08-28 11:55:21 -07:00
  • 544bc64d64 Merge branch '1.1.x' Phillip Webb 2014-08-28 11:31:50 -07:00
  • a07f0272f9 Polish Phillip Webb 2014-08-28 10:58:24 -07:00
  • 04c3e9979f Fix typo Mattias Severson 2014-08-28 13:50:49 +02:00
  • a5484e47cd Extract getServletContextInitializerBeans logic Phillip Webb 2014-08-28 09:34:25 -07:00