1. 12 Feb, 2014 2 commits
  2. 11 Feb, 2014 8 commits
    • Phillip Webb's avatar
      Consistent javadoc "code" block formatting · 9ab886f4
      Phillip Webb authored
      Update javadoc to consistently use the "code" style with <pre> blocks.
      Also include the latest spring-javadoc.css formatting file.
      
      Fixes gh-332
      9ab886f4
    • Phillip Webb's avatar
      Don't register shutdown hook from embedded context · b21f56a2
      Phillip Webb authored
      Change `EmbeddedWebApplicationContext` to no longer automatically call
      `registerShutdownHook()`. Shutdown hooks must now be registered by the
      caller (for users of SpringApplication this will happen automatically).
      
      Fixes gh-314
      b21f56a2
    • Phillip Webb's avatar
      Polish · 5863795e
      Phillip Webb authored
      5863795e
    • Dave Syer's avatar
      Merge pull request #336 from jkubrynski/master · 2f138d84
      Dave Syer authored
      * pull336:
        Now custom SpringApplication class can be used when extending SpringApplicationContextLoader
      2f138d84
    • Jakub Kubrynski's avatar
    • Dave Syer's avatar
      Add placeholder resolution to @PropertySource processing · 76c56c6a
      Dave Syer authored
      Previously the core Spring processing of @PropertySource would
      resolve placeholders in the location attribute, but the pre-loading
      of the property source by Spring Boot didn't do that. Now implemented
      using Environment.resolvePlaceholders() (N.B. at a time when the only
      Environment entries available are system properties and OS env vars).
      
      E.g.
      
      	@Configuration
      	@PropertySource("classpath:/${source.location}.properties")
      	protected static class WithPropertySourcePlaceholders {
                 ...
      	}
      76c56c6a
    • Andy Wilkinson's avatar
      Fix binding of overlapping nested maps · ca7201b4
      Andy Wilkinson authored
      When binding a nested map structure, RelaxedDataBinder pre-populates
      the target object with default empty maps. Previously, when these
      structures overlapped, each step in pre-population process could
      potentially overwrite what had come before it. This led to the output
      of the pre-population process being incomplete which would lead to a
      binding failure.
      
      This commit updates the pre-population process so that it checks to see
      if a property's value has already been set by an earlier step in the
      process. If it has been set, the existing value is now reused rather
      than being overwritten by a new empty map.
      
      Fixes #328
      ca7201b4
    • Dave Syer's avatar
      Add scope=test to hsqldb (fixes #330) · 8de98907
      Dave Syer authored
      8de98907
  3. 10 Feb, 2014 1 commit
    • Andy Wilkinson's avatar
      Filter non-jar artifacts when packaging libs in Gradle plugin · 4f677bec
      Andy Wilkinson authored
      Previously, the Gradle plugin would package all of a project's
      dependencies in the jar's lib directory, irrespective of each
      dependency's type. This led to non-jar artifacts being packaged in
      the lib directory where only jar dependencies are expected. See #334
      for an example failure.
      
      This commit updates the Gradle plugin such that it only packages
      dependencies of type jar, ejb, ejb-client, test-jar, or bundle. This
      brings the Gradle plugin into line with the Maven plugin.
      
      Fixes #334.
      4f677bec
  4. 07 Feb, 2014 3 commits
  5. 06 Feb, 2014 18 commits
  6. 05 Feb, 2014 3 commits
  7. 04 Feb, 2014 5 commits
    • Phillip Webb's avatar
      Restore active profile logic and support `+` · 6ddbf3bd
      Phillip Webb authored
      Restore the previous `spring.profiles.active` logic effectively
      reverting commit 37069d91. This ensures that active profiles defined in
      a higher `PropertySource` replace those lower down.
      
      In addition, add support for a `+` prefix that can be used to indicate
      that a profile should be added to the active set.
      
      For example:
      
      	# application-prod.properties
      	spring.profiles.active=+proddb,+prodmq
      
      Fixed gh-308, gh-309
      6ddbf3bd
    • Phillip Webb's avatar
      Update ErrorMvcAutoConfiguration for Spring 4 · 31c38547
      Phillip Webb authored
      Update ErrorMvcAutoConfiguration thymeleaf condition to use the
      `spring4` package.
      
      Fixes gh-310
      31c38547
    • Phillip Webb's avatar
      Document Listener/Initializer changes · 69f7f384
      Phillip Webb authored
      Fixes gh-312
      69f7f384
    • Phillip Webb's avatar
      Polish · 8ede7306
      Phillip Webb authored
      8ede7306
    • Phillip Webb's avatar
      Use '-1' to disable management port · 676cacd3
      Phillip Webb authored
      Update `EndpointWebMvcAutoConfiguration` to use '-1' to indicate that
      the management context should be disabled. This brings consistency
      between the server settings and the management settings and allows '0'
      to be used to pick a random port.
      
      Fixed gh-311
      676cacd3