1. 29 Jul, 2014 1 commit
  2. 28 Jul, 2014 12 commits
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 53d24301
      Phillip Webb authored
      53d24301
    • Phillip Webb's avatar
      Polish · f8bf0e20
      Phillip Webb authored
      f8bf0e20
    • Phillip Webb's avatar
      Retain default order in HttpMessageConverters · 5e1552b7
      Phillip Webb authored
      The original fix for gh-1293 (commit 05e6af23) caused test failures due
      to the fact that Spring Boot's MappingJackson2HttpMessageConverter was
      added before Spring's default StringHttpMessageConverter.
      
      This commit changes the HttpMessageConverters logic so that additional
      converts are added just before any default converter of the same type.
      This allows additional converters to be added whilst still retaining
      the sensible ordering of the default converters.
      
      Fixes gh-1293
      5e1552b7
    • Dave Syer's avatar
      Merge branch '1.1.x' · 5ce46690
      Dave Syer authored
      5ce46690
    • Dave Syer's avatar
      Prepend without replacing in HttpMessageConverters · 05e6af23
      Dave Syer authored
      It was incorrect to simply replace existing instances because you can't
      tell from the instance which media types and java types it supports. This
      fix just prepends the custom converters so they get higher priority.
      
      Fixes gh-1293
      05e6af23
    • Dave Syer's avatar
      Update git properties plugin · 702253bc
      Dave Syer authored
      702253bc
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · ba2c38c8
      Andy Wilkinson authored
      ba2c38c8
    • Andy Wilkinson's avatar
      Enable test that relies on class and groovy script configuration · 32a19f59
      Andy Wilkinson authored
      Since Spring 4.0.4, it's now possible to use both classes and
      locations to provide a test's configuration.
      
      Closes #1300
      32a19f59
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 29b388e6
      Andy Wilkinson authored
      29b388e6
    • Andy Wilkinson's avatar
      Upgrade to Groovy 2.3.5 · cba50b8e
      Andy Wilkinson authored
      Closes #1299
      cba50b8e
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 85833176
      Andy Wilkinson authored
      85833176
    • Andy Wilkinson's avatar
      Rework Jetty startup so connectors are only started once · bd577f15
      Andy Wilkinson authored
      Previously the server was started to make the ServletContext
      available, then, to prevent requests from being handled before the
      application context had been started, the connectors were stopped.
      Once application context startup had completed, the connectors were
      then started again. In addition to being somewhat inefficient, this
      caused problems on FreeBSD where stopping the connector didn't free
      up the port quickly enough for the subsequent start to then be able
      to bind to it.
      
      This commit updates the Jetty startup logic to be closer to the logic
      that's used for Tomcat. Before the server is started, the configured
      connectors are cached and then removed. The server is then started
      without any connectors. Once application context startup has
      completed, the connectors are reinstated and started.
      
      Fixes #968
      bd577f15
  3. 25 Jul, 2014 4 commits
  4. 24 Jul, 2014 9 commits
  5. 23 Jul, 2014 4 commits
  6. 21 Jul, 2014 10 commits