56 Commits (7d4fbacecd73365ece0f102cc8c87438c1b8dd82)

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
Spring Buildmaster	74d0c5185a	Next development version	10 years ago
Stephane Nicoll	249e09d9bc	Switch master to 1.2.0.BUILD-SNAPSHOT	11 years ago
Phillip Webb	3c7d825658	Fixup version numbers following release	11 years ago
Spring Buildmaster	40327e1ae6	Next development version	11 years ago
Phillip Webb	cc61d92b88	Fixup build following release	11 years ago
Spring Buildmaster	981669b7c0	Next development version	11 years ago
Phillip Webb	200cd535c2	Revert "Next development version" ... This reverts commit 67189477fe.	11 years ago
Spring Buildmaster	67189477fe	Next development version	11 years ago
Phillip Webb	91bbd20ca0	Fixup version numbers following release	11 years ago
Spring Buildmaster	542f3cbda8	Next development version	11 years ago
Dave Syer	542896b28f	Support for non-executable JAR in addition to the repackaged one ... Stretches the Gradle boot plugin a bit, so there's a sample build in the "profile" sample. Howto docs give examples. Fixes gh-1135	11 years ago
Spring Buildmaster	4ca26a21dc	Next development version	11 years ago
Spring Buildmaster	05ed7b3bcd	Next development version	11 years ago
Phillip Webb	3007a777d0	Roll back to 1.1.0.BUILD-SNAPSHOT	11 years ago
Spring Buildmaster	c650f2391e	Next development version	11 years ago
Phillip Webb	64a835e91a	Move master to 1.1.0.BUILD-SNAPSHOT	11 years ago
Spring Buildmaster	d3954a1703	Next development version	11 years ago
Spring Buildmaster	a5864ebcd0	Next development version	11 years ago
Spring Buildmaster	15e9dbe98b	Next development version	11 years ago
Phillip Webb	1e68b7e0a9	Remove superfluous <packaging> tags from POMs	11 years ago
Phillip Webb	0af7f7e347	Add missing POM info	11 years ago
Phillip Webb	488b03387f	Polish POM formatting	11 years ago
Phillip Webb	6f9bb233ad	Revert "Next development version" ... This reverts commit b67bb70ee3.	11 years ago
Spring Buildmaster	b67bb70ee3	Next development version	11 years ago
Phillip Webb	ac4cdd33c3	Revert "Next development version" ... This reverts commit 1d0eea12eb. Returning to 1.0.0.BUILD-SNAPSHOT for an updated release.	11 years ago
Spring Buildmaster	1d0eea12eb	Next development version	11 years ago
Sebastien Deleuze	ab6c8dfee3	Use org.springframework.boot groupId in spring-boot-samples ... Use org.springframework.boot instead of ${project.groupId} groupId in order to make it easier to use spring-boot-samples modules as a starting point for new projects.	11 years ago
Spring Buildmaster	b0d4e8ae69	Next development version	11 years ago
Spring Buildmaster	cb8668a151	Release version 1.0.0.RC4	11 years ago
Dave Syer	8778e82752	Add snakeyaml to spring-boot-starter ... Fixes gh-366	11 years ago
Spring Buildmaster	1367d57e8c	Next development version	11 years ago
Spring Buildmaster	eaff1677a7	Release version 1.0.0.RC3	11 years ago
Phillip Webb	0160760568	Apply latest eclipse cleanup rules	11 years ago
Phillip Webb	cdda330acd	Update copyright header for files changed in 2014	11 years ago
Phillip Webb	68293f34af	Upgrade version to 1.0.0.BUILD-SNAPSHOT ... Fixes fg-243	11 years ago
Dave Syer	5627caa724	Move spring-boot tests utilities to main spring-boot.jar ... Fixes gh-233	11 years ago
Dave Syer	559f907b54	Use explicit test dependencies in samples	11 years ago
Dave Syer	f448e79f29	Remove long package names from samples ... Long package names are really unnecessary in samples and they just clutter things up. Also Spring Loaded doesn't work with org.sfw packages, so to demo that technology you need a different package name.	11 years ago
Phillip Webb	f4f668a52b	Polish	11 years ago
Dave Syer	d6593fbee6	Add extra test for partial overrides	11 years ago
Phillip Webb	b772f7c2e4	Polish ... Minor formatting and consistent copyright header.	11 years ago
Phillip Webb	a33425920b	Rework POMs to support automated CI release	11 years ago
Dave Syer	38e565e920	Back to SNAPSHOT for dev	11 years ago
Dave Syer	b634b3bde6	Update to 0.5.0.M2	11 years ago
Biju Kunjummen	fa3b593568	Removed spring-boot related version from dependencies of samples	11 years ago
Phillip Webb	b5e81ff42d	Fix broken test dependencies	11 years ago
Phillip Webb	d86bf66645	Add parent relativePath ... Update sample applications to correctly refer to parent relativePath.	11 years ago
Phillip Webb	4038b39496	Add OutputCapture test class	11 years ago