19 Commits (ea6162254df1843945300dd36c6e6936714459a2)

Author	SHA1	Message	Date
Phillip Webb	6b083d7e0b	Merge branch '1.1.x' ... 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	10 years ago
Phillip Webb	cac3865ffa	Fixup version numbers following release	10 years ago
Phillip Webb	3c7d825658	Fixup version numbers following release	11 years ago
Phillip Webb	cc61d92b88	Fixup build following release	11 years ago
Phillip Webb	91bbd20ca0	Fixup version numbers following release	11 years ago
Phillip Webb	143e1918b7	Fixup versions following release	11 years ago
Phillip Webb	9e93719922	Fixup version numbers following release	11 years ago
Phillip Webb	3007a777d0	Roll back to 1.1.0.BUILD-SNAPSHOT	11 years ago
Phillip Webb	5adbf32c18	Fixup version numbers following release	11 years ago
Phillip Webb	01fcf61140	Polish	11 years ago
Dave Syer	5249f54c5a	Integrate @ConfigurationProperties @Beans with DataSource configuration ... We now have a much simpler DataSourceAutoConfiguration that binds to whatever DataSource concrete type it finds at runtime. To be able to quickly switch between Hikari and the other types of DataSource there's a minute shim for translating the common properties (username, password, url, driverClassName), but actually only url is different. The shim and also DataSource initialization is supported through DataSourceProperties, but the other native properties get bound directly through the concrete runtime type of the DataSource. The /configprops endpoint works (and is exposed in the actuator sample). Fixes gh-840, fixes gh-477, see also gh-808.	11 years ago
Dave Syer	2c087d4787	Update Boot version in gradle samples	11 years ago
Phillip Webb	f70d6fb411	Declare all repositories in build samples ... Update Gradle and Ant samples to consistently declare all repositories (local, central, release, snapshot, milestone). Fixes gh-426	11 years ago
Phillip Webb	632af6b1ab	Polish gradle examples ... Spaces -> Tabs, version number, whitespace.	11 years ago
Andy Wilkinson	e90bc49988	Add dependency on spring-boot-starter-test ... Fixes #530	11 years ago
Andy Wilkinson	326c12d1f5	Update Spring repository url in Gradle samples	11 years ago
Phillip Webb	c09ca17ca2	Update gradle example builds	11 years ago
Dave Syer	5592023f16	Add support for reloading resources in Gradle plugin ... Usage: $ gradle bootRun ... Edit files in src/main/resources and see the changes live in a web app (e.g. static resources in /static). The old functionality of bootRun has been replaced (since it didn't add a lot of value and also didn't expose any JMV argument setters of anything). This new feature set is backed by any existing "run" task configuration. In addition autodetects a main class if there is one in the project sources, so no need for mainClassName = '...' in build.gradle. Applies the 'application' plugin (so no need to declare that either). Fixes gh-225	11 years ago
Dave Syer	e55e8f9863	Add build.gradle samples and rename runJar->bootRun	11 years ago