1. 18 Sep, 2014 3 commits
  2. 17 Sep, 2014 14 commits
  3. 16 Sep, 2014 5 commits
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · e8ce9371
      Andy Wilkinson authored
      e8ce9371
    • Andy Wilkinson's avatar
      Improve error handling in EnableAutoConfigurationImportSelector · eed58eec
      Andy Wilkinson authored
      Previously, EnableAutoConfigurationImportSelector assumed that it
      would always find auto-configuration attributes from an
      @EnableAutoConfiguration annotation. This assumption does not hold
      true in certain circumstances, although exactly what those
      circumstances are is unclear. It could occur if the import selector
      were used directly, but it's package-private making that unlikey. In
      such circumstances a NullPointerException was being thrown.
      
      This commit asserts that the attributes are non-null and, should the
      assertion fail, produces an error that is more helpful than an NPE.
      
      Closes gh-1512
      eed58eec
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 284e7b20
      Andy Wilkinson authored
      284e7b20
    • Andy Wilkinson's avatar
      Add support for configuring RemoteIpValve’s internalProxies · 468b6cb1
      Andy Wilkinson authored
      Closes gh-1522
      468b6cb1
    • Andy Wilkinson's avatar
      Allow Jackson features to be configured via the environment · 4b25b0e7
      Andy Wilkinson authored
      Enhance JacksonAutoConfiguration to configure features on the
      ObjectMapper it creates based on the following configuration
      properties:
      
      spring.jackson.deserialization.* = true|false
      spring.jackson.generator.* = true|false
      spring.jackson.mapper.* = true|false
      spring.jackson.parser.* = true|false
      spring.jackson.serialization.* = true|false
      
      The final part of each property name maps onto an enum. The enums are:
      
      deserialization: com.fasterxml.jackson.databind.DeserializationFeature
      generator: com.fasterxml.jackson.core.JsonGenerator.Feature
      mapper: com.fasterxml.jackson.databind.MapperFeature
      parser: com.fasterxml.jackson.core.JsonParser.Feature
      serialization: com.fasterxml.jackson.databind.SerializationFeature
      
      Closes gh-1227
      4b25b0e7
  4. 15 Sep, 2014 14 commits
    • Phillip Webb's avatar
      Polish Redis sentinel support · 26ac68df
      Phillip Webb authored
      26ac68df
    • Phillip Webb's avatar
      Polish · b129bc26
      Phillip Webb authored
      b129bc26
    • Phillip Webb's avatar
      Tweak PoolingDataSourceBean.getParentLogger() · 96dceb39
      Phillip Webb authored
      Update PoolingDataSourceBean.getParentLogger() to directly call the
      method rather than use reflection. Also removed the logic from
      `DirectXADataSource` since any fix there should really be applied in
      the DataSource being wrapped (and not the wrapper).
      
      See gh-1518
      96dceb39
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 565e449d
      Phillip Webb authored
      Conflicts:
      	spring-boot-docs/src/main/asciidoc/howto.adoc
      565e449d
    • Phillip Webb's avatar
      Polish · 5ba86a10
      Phillip Webb authored
      5ba86a10
    • Andy Wilkinson's avatar
      Reinstate repository configuration in spring-boot-samples pom · 5a160fbe
      Andy Wilkinson authored
      The repository configuration is there in 1.1.x but missing in master.
      This commit brings the two branches back into line.
      
      Closes gh-1473
      5a160fbe
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 8deb88b3
      Andy Wilkinson authored
      8deb88b3
    • Andy Wilkinson's avatar
      Document build-time property expansion using Gradle · 2ba2cfe2
      Andy Wilkinson authored
      Closes gh-1540
      2ba2cfe2
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 9b719ac5
      Andy Wilkinson authored
      9b719ac5
    • Andy Wilkinson's avatar
      Provide group in ResolvedArtifactLibrary to enable discrimination · 3c815f40
      Andy Wilkinson authored
      The fix for gh-1475 introduced the use of an artifact's group to
      discriminate between two libraries with the same name (artifact id)
      and version. However, in the case of Gradle, a group name was not
      provided for libraries that have been resolved from a repository.
      
      This commit updates ResolvedArtifactLibrary to use the group obtained
      from the underlying ResolvedArtifact as its discriminator.
      
      Fixes gh-1543
      3c815f40
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · c0280493
      Andy Wilkinson authored
      c0280493
    • Andy Wilkinson's avatar
      Add additional class conditions for JTA auto-configuration · 6f9f335e
      Andy Wilkinson authored
      Previously, JTA auto-configuration would fail with a variety of
      ClassNotFoundExceptions and NoClassDefFoundErrors if it was used with
      an “incomplete” classpath. This commit adds a number of classes to
      @ConditionalOnClass annotations so that the auto-configuration backs
      off gracefully in the absence of certain classes.
      
      Specifically, the following now work as expected:
      
       - Deploying an app to a server with JTA available via JNDI when the
         app does not use transactions
       - Auto-configuration of Atomikos without JMS
       - Auto-configuration of Bitronix without JMS
      
      Both XADataSourceAutoConfiguration and JndiDataSourceAutoConfiguration
      have been updated to back off in the absence of spring-jdbc; a
      dependency of DataSourceProperties which is used by both classes.
      
      Error handling in AtomikosDependsOnBeanFactoryPostProcessor and
      BitronixDependentBeanFactoryPostProcessor has been enhanced so that the
      correct dependencies are established, even in the absence of JMS.
      
      Fixes gh-1538
      6f9f335e
    • Dave Syer's avatar
      Add url,user,password to LiquibaseProperties · 6456f2a5
      Dave Syer authored
      User can set those properties (optionally) to use a different
      DataSource than the default.
      
      Fixes gh-1558
      6456f2a5
    • Dave Syer's avatar
      Use class name not value to support non-Hibernate JPA vendors · 59ce6344
      Dave Syer authored
      With this change I got a simple Eclipselink version of the data-jpa
      sample working. I'll push that when I get time to research it a bit more
      (I needed to set up a Java agent so either that might be a problem
      for our integration tests if we can't work around it).
      
      Fixes gh-1268. Cherry picked onto master after (apparently) a failed
      merge of commit ac2ab39a.
      59ce6344
  5. 13 Sep, 2014 4 commits