1. 14 Jan, 2016 7 commits
    • Andy Wilkinson's avatar
      Merge branch '1.2.x' · 89beef40
      Andy Wilkinson authored
      89beef40
    • Andy Wilkinson's avatar
      Exclude Java agents from class loader created by PropertiesLauncher · 681a866c
      Andy Wilkinson authored
      PropertiesLauncher creates a ClassLoader that is used by the Launcher
      to load an application’s classes. During the creation of this
      ClassLoader URLs from its ClassLoader. This resulted resulting in Java
      agents that are added to the system class loader via the -javaagent
      launch option being available on both the system class loader and the
      created class loader. Java agents are intended to always be loaded by
      the system class loader. Making them available on another class loader
      breaks this model.
      
      This is the same problem that was in ExecutableArchiveLauncher and
      that was fixed in ee08667e (see gh-863).
      
      This commit updates PropertiesLauncher so that it skips the URLs of
      any Java agents (found by examining the JVM’s input arguments) when
      copying URLs over to the new ClassLoader, thereby ensuring that Java
      agents are only ever loaded by the system class loader.
      
      Closes gh-4911
      681a866c
    • Andy Wilkinson's avatar
      Merge branch '1.2.x' · 24fd5037
      Andy Wilkinson authored
      24fd5037
    • Andy Wilkinson's avatar
      Correct the name of MySQL's XADataSource implementation · b9973921
      Andy Wilkinson authored
      Closes gh-4942
      b9973921
    • Phillip Webb's avatar
      Add ExitCodeExceptionMapper support · 13db85f8
      Phillip Webb authored
      Add ExitCodeExceptionMapper strategy interface which can be used to map
      exceptions to exit codes.
      
      Closes gh-4803
      13db85f8
    • Andy Wilkinson's avatar
      Resend SIGTERM if app is still running 30 seconds after first attempt · 487a66a7
      Andy Wilkinson authored
      Previously, the default launch script would send SIGTERM once and then
      wait for up to 60 seconds for the app to have stopped. If the service
      was stopped immediately after being started the first SIGTERM would
      occasionally be ignored (presumably because the JVM was not yet in a
      state to handle it) causing the service stop request to fail.
      
      This commit updates the launch script to resend SIGTERM to the process
      if it's still running 30 seconds after the first SIGTERM was sent.
      
      Closes gh-4941
      487a66a7
    • Andy Wilkinson's avatar
      Address Shellcheck warning (SC2086) for $arguments in launch script · 3afd0c7b
      Andy Wilkinson authored
      $arguments needs to be split on spaces so it can’t just be wrapped
      in quotes. This commit updates arguments to be an array that is then
      expanded ("{arguments[@]}"). The use of @ and double quotes means that
      it is expanded into all elements individually quoted.
      
      See gh-4866
      3afd0c7b
  2. 13 Jan, 2016 12 commits
    • Andy Wilkinson's avatar
      Complete static final logger changes that were started in ec2f33f9 · 27a81e14
      Andy Wilkinson authored
      This commit completes the changes to consistently used static final
      fields for Log instances that were started in ec2f33f9. Specifically it:
      
       - Removes this. when accessing logger fields that are now static
       - Renames some fields from log to logger
       - Makes some logger fields static
      
      See gh-4784
      27a81e14
    • Andy Wilkinson's avatar
      Switch off Security Filter auto-config when spring-security-config is absent · 150a6f0f
      Andy Wilkinson authored
      SecurityFilterAutoConfiguration uses SecurityProperties which uses
      SessionCreationPolicy from spring-security-config. This commit makes
      SecurityFilterAutoConfiguration conditional on SessionCreationPolicy,
      thereby preventing a startup failure if spring-security-web is on the
      classpath but spring-security-config is not.
      
      Closes gh-4919
      150a6f0f
    • Phillip Webb's avatar
      Polish · 152ee952
      Phillip Webb authored
      152ee952
    • Andy Wilkinson's avatar
      Merge branch 'launch-script' · 0fd4af81
      Andy Wilkinson authored
      0fd4af81
    • Andy Wilkinson's avatar
      Add integration tests for default launch script · d1b47c8a
      Andy Wilkinson authored
      This commit adds a suit of integration tests for the launch script. See
      the accompanying README.adoc for further details.
      
      Closes gh-4872
      d1b47c8a
    • Andy Wilkinson's avatar
      Fix quoting of start-stop-daemon RUN_ARGS and JAVA_OPTS in launch script · c39a55a2
      Andy Wilkinson authored
      81a47639 introduced a regression when multiple RUN_ARGS or JAVA_OPTS were
      configured. Rather than the JVM being launched with multiple arguments
      all of the RUN_ARGS or JAVA_OPTS were passed as a single argument. This
      caused unexpected behaviour and typically caused the application to fail
      to start.
      
      This commit updates the quoting of the arguments the are supplied when
      launching the app using start-stop-daemon so that space-separated
      entries in RUN_ARGS and JAVA_OPTS remain separate.
      
      Closes gh-4866
      c39a55a2
    • Andy Wilkinson's avatar
      Improve portability by using type instead of which in the launch script · 04fe55a2
      Andy Wilkinson authored
      Previously, the launch script used which to determine the availability
      of start-stop-daemon. which isn’t available by default on all OSs.
      For example, it’s not available by default on CentOS 5.
      
      This commit updates the launch script to use type when determining if
      start-stop-daemon is available. This improves the portability of the
      script and makes the use of type consistent throughout the script.
      
      Closes gh-4925
      04fe55a2
    • Andy Wilkinson's avatar
      Update launch script to wait for pid to be written to pid file · a1e0f2f5
      Andy Wilkinson authored
      Previously, the launch script would wait for the pid file to exist
      before continuing. This didn’t work 100% of the time as it left a 
      window where the file had been created but the PID had not been written
      to it that could result in an incorrect report of the app failing to
      start.
      
      This commit updates the script to wait for the file to have a size
      greater than zero before continuing. This ensures that the pid has
      been written to the file before the pid is read from the file and used
      to check that the process is running.
      
      Closes gh-4923
      a1e0f2f5
    • Andy Wilkinson's avatar
      Add dependency management for jackson-jaxrs-json-provider · c1c62c16
      Andy Wilkinson authored
      Closes gh-4932
      c1c62c16
    • Phillip Webb's avatar
      Publish ExitCodeEvent when possible · a20cd2de
      Phillip Webb authored
      Update SpringApplication to publish an ExitCodeEvent when a valid exit
      code is known.
      
      Fixes gh-4804
      a20cd2de
    • Phillip Webb's avatar
      Allow ExitCodeGenerator to be used on Exceptions · 7397dbaf
      Phillip Webb authored
      Update exit code support to allow the ExitCodeGenerator interface to
      be placed on an Exception. Any uncaught exception implementing the
      interface and returning a non `0` status will now trigger a System.exit
      with the code.
      
      Fixes gh-4803
      7397dbaf
    • Phillip Webb's avatar
      Polish · d2fed8bb
      Phillip Webb authored
      d2fed8bb
  3. 12 Jan, 2016 8 commits
  4. 11 Jan, 2016 1 commit
  5. 05 Jan, 2016 2 commits
  6. 04 Jan, 2016 2 commits
  7. 03 Jan, 2016 2 commits
  8. 30 Dec, 2015 1 commit
  9. 28 Dec, 2015 4 commits
  10. 25 Dec, 2015 1 commit
    • Stephane Nicoll's avatar
      Polish documentation · a87a1f05
      Stephane Nicoll authored
      Clarify that "spring.config.*" properties doesn't work in configuration
      files.
      
      Closes gh-4838
      a87a1f05