1. 15 Aug, 2014 6 commits
  2. 13 Aug, 2014 6 commits
  3. 12 Aug, 2014 3 commits
    • Phillip Webb's avatar
      Fix broken parent POM version · 6634af6a
      Phillip Webb authored
      Update the parent POM version in spring-boot-sample-web-secure-custom
      6634af6a
    • Dave Syer's avatar
      Merge branch '1.1.x' · 300910f7
      Dave Syer authored
      300910f7
    • Dave Syer's avatar
      Refactor AuthenticationManagerConfiguration to make sure it works · 0cf1c6f0
      Dave Syer authored
      if user also adds @EnableWebMvcSecurity. The problem is that the ordering
      of the init() and configure() methods in the Spring Security configurers
      can force things to happen too early unless we are careful. It's still a bit
      twitchy I would say, but this relatively small change seems to fix the GS guide
      and not break any existing tests.
      
      I added a sample which mimic ths GS guide so we get an integration test that
      executes the new code paths.
      
      Fixes gh-1364
      0cf1c6f0
  4. 11 Aug, 2014 5 commits
    • Phillip Webb's avatar
      Merge remote-tracking branch 'springsource/1.1.x' · 029b9dba
      Phillip Webb authored
      Conflicts:
      	spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
      029b9dba
    • Phillip Webb's avatar
      Don't cause early FactoryBean instantiation · 9a7a4a46
      Phillip Webb authored
      Update ConfigurationPropertiesBindingPostProcessor to use
      `getBeansOfType` with `allowEagerInit=false` rather than `getBean`.
      
      This prevents FactoryBeans from being instantiated early when their
      type is not known.
      
      Fixed gh-1365
      9a7a4a46
    • Phillip Webb's avatar
      Polish · acb621e8
      Phillip Webb authored
      acb621e8
    • Phillip Webb's avatar
      Rename VanillaHealthIndicator to Application... · 7d0a3ddc
      Phillip Webb authored
      Rename `VanillaHealthIndicator` to `ApplicationHealthIndicator` and
      changed the exposed bean name from `statusHealthIndicator` to
      `applicationHealthIndicator`.
      
      This provides less confusing JSON output:
      
        {"status":"UP","application":{"status":"UP"}}
      
      vs:
      
        {"status":"UP","status":{"status":"UP"}}
      
      Fixes gh-1291
      7d0a3ddc
    • Stephane Nicoll's avatar
      Add auto configuration for Spring 4.1 JMS features · d0896859
      Stephane Nicoll authored
      This commit adds two additional auto-configuration items that are new
      in Spring 4.1
      
      * A JmsMessagingTemplate is automatically created if none is present
      * A default JmsListenerContainerFactory is automatically created if
        @EnableJms has been triggered and no default has been set manually
      
      Fixes gh-1298
      d0896859
  5. 08 Aug, 2014 2 commits
  6. 07 Aug, 2014 9 commits
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 6b083d7e
      Phillip Webb authored
      Conflicts:
      	pom.xml
      	spring-boot-actuator/pom.xml
      	spring-boot-autoconfigure/pom.xml
      	spring-boot-cli/pom.xml
      	spring-boot-dependencies/pom.xml
      	spring-boot-docs/pom.xml
      	spring-boot-full-build/pom.xml
      	spring-boot-integration-tests/pom.xml
      	spring-boot-parent/pom.xml
      	spring-boot-samples/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator/pom.xml
      	spring-boot-samples/spring-boot-sample-amqp/pom.xml
      	spring-boot-samples/spring-boot-sample-aop/pom.xml
      	spring-boot-samples/spring-boot-sample-batch/pom.xml
      	spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
      	spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
      	spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
      	spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
      	spring-boot-samples/spring-boot-sample-data-redis/pom.xml
      	spring-boot-samples/spring-boot-sample-data-rest/pom.xml
      	spring-boot-samples/spring-boot-sample-data-solr/pom.xml
      	spring-boot-samples/spring-boot-sample-flyway/pom.xml
      	spring-boot-samples/spring-boot-sample-hornetq/pom.xml
      	spring-boot-samples/spring-boot-sample-integration/pom.xml
      	spring-boot-samples/spring-boot-sample-jetty/pom.xml
      	spring-boot-samples/spring-boot-sample-liquibase/pom.xml
      	spring-boot-samples/spring-boot-sample-parent-context/pom.xml
      	spring-boot-samples/spring-boot-sample-profile/pom.xml
      	spring-boot-samples/spring-boot-sample-secure/pom.xml
      	spring-boot-samples/spring-boot-sample-servlet/pom.xml
      	spring-boot-samples/spring-boot-sample-simple/pom.xml
      	spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
      	spring-boot-samples/spring-boot-sample-tomcat/pom.xml
      	spring-boot-samples/spring-boot-sample-tomcat8-jsp/pom.xml
      	spring-boot-samples/spring-boot-sample-traditional/pom.xml
      	spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
      	spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
      	spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
      	spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
      	spring-boot-samples/spring-boot-sample-web-secure/pom.xml
      	spring-boot-samples/spring-boot-sample-web-static/pom.xml
      	spring-boot-samples/spring-boot-sample-web-ui/pom.xml
      	spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
      	spring-boot-samples/spring-boot-sample-websocket/pom.xml
      	spring-boot-samples/spring-boot-sample-ws/pom.xml
      	spring-boot-samples/spring-boot-sample-xml/pom.xml
      	spring-boot-starters/pom.xml
      	spring-boot-starters/spring-boot-starter-actuator/pom.xml
      	spring-boot-starters/spring-boot-starter-amqp/pom.xml
      	spring-boot-starters/spring-boot-starter-aop/pom.xml
      	spring-boot-starters/spring-boot-starter-batch/pom.xml
      	spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
      	spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
      	spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
      	spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
      	spring-boot-starters/spring-boot-starter-data-rest/pom.xml
      	spring-boot-starters/spring-boot-starter-data-solr/pom.xml
      	spring-boot-starters/spring-boot-starter-freemarker/pom.xml
      	spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
      	spring-boot-starters/spring-boot-starter-hornetq/pom.xml
      	spring-boot-starters/spring-boot-starter-integration/pom.xml
      	spring-boot-starters/spring-boot-starter-jdbc/pom.xml
      	spring-boot-starters/spring-boot-starter-jetty/pom.xml
      	spring-boot-starters/spring-boot-starter-log4j/pom.xml
      	spring-boot-starters/spring-boot-starter-logging/pom.xml
      	spring-boot-starters/spring-boot-starter-mobile/pom.xml
      	spring-boot-starters/spring-boot-starter-parent/pom.xml
      	spring-boot-starters/spring-boot-starter-redis/pom.xml
      	spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
      	spring-boot-starters/spring-boot-starter-security/pom.xml
      	spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
      	spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
      	spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
      	spring-boot-starters/spring-boot-starter-test/pom.xml
      	spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
      	spring-boot-starters/spring-boot-starter-tomcat/pom.xml
      	spring-boot-starters/spring-boot-starter-velocity/pom.xml
      	spring-boot-starters/spring-boot-starter-web/pom.xml
      	spring-boot-starters/spring-boot-starter-websocket/pom.xml
      	spring-boot-starters/spring-boot-starter-ws/pom.xml
      	spring-boot-starters/spring-boot-starter/pom.xml
      	spring-boot-tools/pom.xml
      	spring-boot-tools/spring-boot-dependency-tools/pom.xml
      	spring-boot-tools/spring-boot-gradle-plugin/pom.xml
      	spring-boot-tools/spring-boot-loader-tools/pom.xml
      	spring-boot-tools/spring-boot-loader/pom.xml
      	spring-boot-tools/spring-boot-maven-plugin/pom.xml
      	spring-boot-versions/pom.xml
      	spring-boot/pom.xml
      6b083d7e
    • Phillip Webb's avatar
      Fixup version numbers following release · cac3865f
      Phillip Webb authored
      cac3865f
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 80ee963c
      Phillip Webb authored
      80ee963c
    • Spring Buildmaster's avatar
      Next development version · 74d0c518
      Spring Buildmaster authored
      74d0c518
    • Phillip Webb's avatar
      Attempt to fix failing build · ccda6f63
      Phillip Webb authored
      ccda6f63
    • Phillip Webb's avatar
      Move repositories out of parent POM · e237dbee
      Phillip Webb authored
      Move repository declarations out of the parent POM and into setting.xml
      (except for the default profile). Also added jboss repository in an
      attempt to fix the failing CI release.
      
      Fixed gh-1349
      e237dbee
    • Stephane Nicoll's avatar
      Add JCache API dependency management · df9200d4
      Stephane Nicoll authored
      The dependency is currently declared in Spring IO Platform from where
      it can be removed once it's using a version of Boot that contains
      this change. To make the migration of the dependency management from
      the Platform to Boot seamless, the dependency is versioned using a
      property with the same name as is currently used by the Platform:
      javax-cache.version
      
      Closes #1347
      df9200d4
    • Dave Syer's avatar
      Merge branch '1.1.x' · 178386ab
      Dave Syer authored
      178386ab
    • Dave Syer's avatar
      Use ApplicationEvent to ensure that authentication event publisher is registered · 38f8d657
      Dave Syer authored
      There was a reference to an old (fixed) issue in Spring which led to some simplification
      of the AuthenticationManager layering as well.
      
      Fixes gh-1335
      38f8d657
  7. 06 Aug, 2014 9 commits