1. 28 Oct, 2014 11 commits
  2. 27 Oct, 2014 10 commits
  3. 24 Oct, 2014 1 commit
  4. 23 Oct, 2014 1 commit
  5. 22 Oct, 2014 6 commits
  6. 21 Oct, 2014 5 commits
  7. 20 Oct, 2014 4 commits
    • Andy Wilkinson's avatar
      Install SLF4JBridgeHandler when Log4J2LoggingSystem is initialized · c3479727
      Andy Wilkinson authored
      Previously, Log4J2LoggingSystem did not install SLF4JBridgeHandler.
      SLF4JBridgeHandler is used to route logging calls made using
      java.util.logging into SLF4J. This resulted in entries being written
      to System.err instead.
      
      This commit updates Log4J2LoggingSystem to register the bridge handler
      thereby ensuring the logging that originates into java.util.logging is
      routed into SLF4J. This change has been made by extracting a new
      abstract superclass that performs the registration. This super class is
      extended by all SLF4J-based LoggingSystem implementations.
      
      Fixes gh-1737
      c3479727
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 6b1f76ad
      Andy Wilkinson authored
      6b1f76ad
    • Andy Wilkinson's avatar
      Protect against race condition where output file exists but it is empty · 160d609b
      Andy Wilkinson authored
      Previously, there was a timing window where the output file had been
      created but it was empty. This would cause the test to fail as the
      output was read from the empty file and didn’t match the expected “Hello
      World”.
      
      This commit updates the test to only process the resources in the output
      directory when all the resolved resources have a non-zero content
      length. An @Before method has also been added to delete the output
      produced by the test so that the outcome of the test isn’t affected by
      files generated by previous runs.
      
      Fixes gh-1735
      160d609b
    • Andy Wilkinson's avatar
      Fix ArrayStoreException caused by JerseyAutoConfiguration again · 31874090
      Andy Wilkinson authored
      This is a follow-on from the changes made in 2b7bf3e7. In addition to the
      problematic use of @ConditionalOnClass that was addressed in 2b7bf3e7,
      JerseyAutoConfiguration also used @ConditionalOnBean referencing a 
      Jersey class. This has the same problem when used on a class that
      implements WebApplicationInitializer. Implementing
      WebApplicationInitializer causes the class’s annotations to be
      introspected during servlet container initialiser processing. If a
      @ConditionalOnBean annotation references a Class that cannot be
      loaded an ArrayStoreException occurs.
      
      This commit updates JerseyAutoConfiguration to reference ResourceConfig
      as a String. This allows it annotations to be introspected without
      attempting to load a Jersey class that may not be on the classpath.
      
      Fixes gh-1733
      Fixes gh-1719
      31874090
  8. 16 Oct, 2014 2 commits
    • Brett Wooldridge's avatar
      Update HikariCP to 2.1.0, compile against the Java 6-compatible artifact · 9984939c
      Brett Wooldridge authored
      For those running applications on Java 8, dependency management for the
      Java 8-compatible artifact is also provided.
      
      Closes gh-1721
      9984939c
    • Andy Wilkinson's avatar
      Reinstate Bitronix's default server ID, provide property to override it · 01fd8cb8
      Andy Wilkinson authored
      Previously, Bitronix's server ID was hard-coded to be
      spring-boot-jta-bitronix. This created the possibility of multiple
      transaction managers performing recovery on each other's behalf as
      they would be unable to identify their own XIDs due to the common
      server ID.
      
      This commit reinstates the default (which is the IP address of the
      machine on which Bitronix is running), and introduces a new
      property, spring.jta.transaction-manager-id, that can be used to
      configure the id for both Atomikos and Bitronix. A cautionary note
      has also been added to the documentation for Atomikos and Bitronix
      explaining the need to configure this property.
      
      Closes gh-1548
      01fd8cb8