Commit Graph

  • 8d5f26f6bd Fix missing resource exception if spring-cloud not on classpath Dave Syer 2014-09-30 15:08:58 +01:00
  • e070d55491 Make Jackson date format and property naming strategy configurable Marcel Overdijk 2014-09-26 13:41:15 +02:00
  • fcd855cd5e Merge branch '1.1.x' Andy Wilkinson 2014-09-30 10:30:08 +01:00
  • 8fcf355d71 Merge branch 'gh-1627' into 1.1.x Andy Wilkinson 2014-09-30 10:29:57 +01:00
  • 61e90f5b6e Add tests to Data REST sample for search operations Andy Wilkinson 2014-09-30 10:15:47 +01:00
  • b798d001d7 Add missing @Param annotations to CityRepository in Data REST sample bangsen.yin 2014-09-26 11:28:25 +08:00
  • 8b0d64522c Merge pull request #1633 from johnktims/master Stephane Nicoll 2014-09-29 10:00:05 +02:00
  • bebbe92fef Fix typo in javadoc John Tims 2014-09-28 09:52:48 -04:00
  • d1c5c90ca9 Merge pull request #1609 from hekonsek/spring-boot-amq-version-upgrade Phillip Webb 2014-09-26 13:09:16 -07:00
  • 7f20f5d4f8 Upgraded ActiveMQ version to 5.10.0 Henryk Konsek 2014-09-24 15:41:36 +02:00
  • 32641abae4 Merge pull request #1618 from mkanev/master Phillip Webb 2014-09-26 13:05:57 -07:00
  • 6b5de38fef Add UTF-8 charset element to logback base.xml Maksim Kanev 2014-09-25 18:18:53 +04:00
  • a7a337a14f Merge branch '1.1.x' Phillip Webb 2014-09-25 22:04:23 -07:00
  • d0990c06a6 Fix typo in HttpMessageConverters auto-conf Tests Phillip Webb 2014-09-25 22:03:30 -07:00
  • e156e1a7f6 Merge branch '1.1.x' Phillip Webb 2014-09-25 21:38:40 -07:00
  • 4f9258a345 Fixup version numbers following release Phillip Webb 2014-09-25 21:37:40 -07:00
  • edb4b7ed7d Next development version Spring Buildmaster 2014-09-25 21:02:37 -07:00
  • b9edf3c500 Merge branch '1.1.x' Phillip Webb 2014-09-25 20:16:04 -07:00
  • fa02c01727 Polish Phillip Webb 2014-09-25 20:15:49 -07:00
  • 08f2522eba Add missing @since tag Phillip Webb 2014-09-25 20:09:49 -07:00
  • 1ed90df630 Merge branch '1.1.x' Phillip Webb 2014-09-25 13:06:54 -07:00
  • bff39e954e Add server.tomcat.port-header support Phillip Webb 2014-09-25 13:04:12 -07:00
  • 0dc46a2fe7 Drop protocolHeader and remoteIpHeader defaults Phillip Webb 2014-09-25 12:58:23 -07:00
  • 0c63406b49 Merge branch '1.1.x' Andy Wilkinson 2014-09-25 19:06:37 +01:00
  • 72ef1d6554 Update ErrorPageFilter so it won’t try to forward a committed response Andy Wilkinson 2014-09-25 18:07:27 +01:00
  • abed1f4d4c Restore ThymeleafAutoConfiguration test Phillip Webb 2014-09-25 10:41:12 -07:00
  • 38585ec4eb Merge branch '1.1.x' Phillip Webb 2014-09-25 10:40:49 -07:00
  • 258059ea08 Fix failing ThymeleafAutoConfigurationTests Phillip Webb 2014-09-25 10:26:02 -07:00
  • 9d9819c338 Merge branch '1.1.x' Dave Syer 2014-09-25 18:15:33 +01:00
  • c1404b1e41 Tidy some Javadocs Dave Syer 2014-09-25 18:15:15 +01:00
  • 0d0e5eb590 Merge branch '1.1.x' Phillip Webb 2014-09-25 10:05:35 -07:00
  • 336b96b81c Copy server customization to management context Dave Syer 2014-09-25 17:39:53 +01:00
  • 304920df07 Make Thymeleaf @ConditionalOnWebApplication Dave Syer 2014-09-25 13:55:18 +01:00
  • 68ff7d4592 Fix broken documentation links Stéphane DERACO 2014-09-24 23:27:41 +02:00
  • 0b50fe4eff Support String to char[] bindings Phillip Webb 2014-09-24 16:03:51 -07:00
  • 55a84c7bd7 Merge branch '1.1.x' Phillip Webb 2014-09-24 14:12:02 -07:00
  • 23ff7c91d6 Add debug logging to ConfigFileApplicationListener Phillip Webb 2014-09-24 14:08:14 -07:00
  • 142216400a Polish formatting Phillip Webb 2014-09-24 12:04:40 -07:00
  • b4c94f427a Merge branch '1.1.x' Andy Wilkinson 2014-09-23 12:07:39 +01:00
  • c420249f7d Detect startup failures in additional Tomcat connectors Andy Wilkinson 2014-09-23 11:51:24 +01:00
  • 5d1a114aa6 Merge branch '1.1.x' Andy Wilkinson 2014-09-23 10:14:03 +01:00
  • cf22e28ddc Add tests to verify that ActiveMQAutoConfiguration backs off Andy Wilkinson 2014-09-23 10:09:40 +01:00
  • 42821990f4 Merge branch '1.1.x' Andy Wilkinson 2014-09-23 09:42:29 +01:00
  • 38d8a5cda0 Fix typo in comment Tomas Lin 2014-09-22 13:13:26 -07:00
  • 97dcd24668 Merge branch '1.1.x' Dave Syer 2014-09-22 12:16:21 +01:00
  • a63d0b4e16 Update docs with DispatcherType.ERROR for filters Dave Syer 2014-09-22 12:14:58 +01:00
  • 944045cd34 Merge branch '1.1.x' Andy Wilkinson 2014-09-22 09:27:13 +01:00
  • 5c84e17d10 Activate WebSecurityEnabler only for web applications Marius Bogoevici 2014-09-19 16:04:42 -04:00
  • c2e588a37c Merge branch '1.1.x' Andy Wilkinson 2014-09-22 09:13:21 +01:00
  • a8af254765 Fix description of test file to be tests.groovy N Jain 2014-09-20 16:56:19 -07:00
  • 0468cf5a8f Merge branch '1.1.x' Phillip Webb 2014-09-19 22:42:53 -07:00
  • 468db03aef Formatting Phillip Webb 2014-09-19 22:41:10 -07:00
  • a3e0fa22a2 Add version properties for banner.txt usage Phillip Webb 2014-09-19 14:11:43 -07:00
  • b06d10ddb0 Merge branch '1.1.x' Dave Syer 2014-09-19 16:12:38 +01:00
  • d6165d97dd A few tweaks that might improve performance on startup Dave Syer 2014-09-19 16:02:29 +01:00
  • 2dbe4d706b Merge branch '1.1.x' Andy Wilkinson 2014-09-18 16:45:19 +01:00
  • 6248fc0d60 Fix logic for identifying test classes on Windows Andy Wilkinson 2014-09-18 16:44:28 +01:00
  • 3c5b007ff9 Add @Order annotations to conditions Phillip Webb 2014-09-17 21:55:43 -07:00
  • 22378698fe Upgrade to Spring Framework 4.1.1.BUILD-SNAPSHOT Phillip Webb 2014-09-17 21:37:23 -07:00
  • 51b8b1e590 Merge branch '1.1.x' Phillip Webb 2014-09-17 18:06:06 -07:00
  • bebcd60b7c Call LoggerContext.reset() during logback init Phillip Webb 2014-09-17 18:00:41 -07:00
  • 3c93d9a803 Merge branch '1.1.x' Andy Wilkinson 2014-09-17 19:41:14 +01:00
  • 6dcaec2fef Make all @Bean methods public Andy Wilkinson 2014-09-17 19:33:14 +01:00
  • aeeade2ed5 Merge missed documentation update Stephane Nicoll 2014-07-09 15:57:22 +02:00
  • 88f8eb7fa4 Merge branch '1.1.x' Phillip Webb 2014-09-17 10:46:30 -07:00
  • 611f978181 Make all @Bean methods public Phillip Webb 2014-09-17 10:45:23 -07:00
  • d441e7af93 Fix merge error Phillip Webb 2014-09-17 10:20:08 -07:00
  • 52853085a9 Merge branch '1.1.x' Phillip Webb 2014-09-17 10:13:02 -07:00
  • 9e9e450211 Fix @Since tag Phillip Webb 2014-09-17 10:12:48 -07:00
  • 4f610fa5a1 Merge branch '1.1.x' Phillip Webb 2014-09-17 10:11:30 -07:00
  • 62a5ce52d0 Backport Jetty/Tomcat SSL support Phillip Webb 2014-09-17 09:30:37 -07:00
  • fae9ab4140 Fix failing tests Phillip Webb 2014-09-17 10:07:55 -07:00
  • c0f69d28d3 Remove inadvertently committed debug System.out Phillip Webb 2014-09-17 09:49:09 -07:00
  • 5946ade199 Merge branch '1.1.x' Dave Syer 2014-09-17 10:20:03 +01:00
  • 95c15733bc Use ErrorController.getErrorPath() to ignore the error path for security Dave Syer 2014-09-17 10:17:48 +01:00
  • e8ce93715a Merge branch '1.1.x' Andy Wilkinson 2014-09-16 17:20:35 +01:00
  • eed58eecb4 Improve error handling in EnableAutoConfigurationImportSelector Andy Wilkinson 2014-09-16 15:56:22 +01:00
  • 284e7b2091 Merge branch '1.1.x' Andy Wilkinson 2014-09-16 15:40:23 +01:00
  • 468b6cb1f7 Add support for configuring RemoteIpValve’s internalProxies Andy Wilkinson 2014-09-16 15:39:11 +01:00
  • 4b25b0e7a2 Allow Jackson features to be configured via the environment Andy Wilkinson 2014-08-06 17:08:21 +01:00
  • 26ac68df05 Polish Redis sentinel support Phillip Webb 2014-09-15 13:04:32 -07:00
  • b129bc261a Polish Phillip Webb 2014-09-15 12:28:55 -07:00
  • 96dceb39a4 Tweak PoolingDataSourceBean.getParentLogger() Phillip Webb 2014-09-15 11:58:53 -07:00
  • 565e449d89 Merge branch '1.1.x' Phillip Webb 2014-09-15 11:37:50 -07:00
  • 5ba86a103d Polish Phillip Webb 2014-09-15 11:35:16 -07:00
  • 5a160fbe5a Reinstate repository configuration in spring-boot-samples pom Andy Wilkinson 2014-09-15 17:48:01 +01:00
  • 8deb88b3c0 Merge branch '1.1.x' Andy Wilkinson 2014-09-15 16:40:42 +01:00
  • 2ba2cfe23d Document build-time property expansion using Gradle Andy Wilkinson 2014-09-15 16:25:00 +01:00
  • 9b719ac58e Merge branch '1.1.x' Andy Wilkinson 2014-09-15 15:45:18 +01:00
  • 3c815f4014 Provide group in ResolvedArtifactLibrary to enable discrimination Andy Wilkinson 2014-09-15 15:40:29 +01:00
  • c02804931f Merge branch '1.1.x' Andy Wilkinson 2014-09-15 15:39:41 +01:00
  • 6f9f335ea1 Add additional class conditions for JTA auto-configuration Andy Wilkinson 2014-09-12 14:19:10 -05:00
  • 6456f2a542 Add url,user,password to LiquibaseProperties Dave Syer 2014-09-15 08:30:58 -05:00
  • 59ce634437 Use class name not value to support non-Hibernate JPA vendors Dave Syer 2014-07-21 22:22:36 +01:00
  • bfab6b45f5 Merge branch '1.1.x' Dave Syer 2014-09-13 11:01:10 -05:00
  • 7828f2a5d3 Update docs on metrics names Dave Syer 2014-09-13 11:00:55 -05:00
  • 049cd4b85b Merge branch '1.1.x' Dave Syer 2014-09-13 10:59:32 -05:00
  • deef784403 Blitz some more special characters from the metric names Dave Syer 2014-09-13 07:08:06 -05:00
  • 437fb75424 Add /error to ignored paths for security autoconfig Dave Syer 2014-09-13 10:55:39 -05:00
  • f26209f248 Blitz some more special characters from the metric names Dave Syer 2014-09-13 07:08:06 -05:00