76 Commits (1ed90df6301bb5474439b82751dea4ac691a4ad2)

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	fa88c481a5	Remote trailing whitespace	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
Phillip Webb	143e1918b7	Fixup versions following release	11 years ago
Spring Buildmaster	4ca26a21dc	Next development version	11 years ago
Phillip Webb	9e93719922	Fixup version numbers following release	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
Phillip Webb	5adbf32c18	Fixup version numbers following release	11 years ago
Spring Buildmaster	c650f2391e	Next development version	11 years ago
Dave Syer	2c087d4787	Update Boot version in gradle samples	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
Phillip Webb	fad5ce45db	Polish	11 years ago
Dave Syer	559009b8cf	Support for random ports in @IntegrationTest ... User can now set up default properties in the Environment using @IntegrationTest("foo:bar", "x:y") etc. Using "server.port:0" you can get Tomcat or Jetty to spin up on a random port. We also add a test listener that populates "local.server.port" with the actual port the server started on so you can @Value("${local.server.port}") inject it into the test case. See gh-607 (this should make the extension of that PR to samples much easier)	11 years ago
Dave Syer	d613cc795e	SpringSource->spring-projects	11 years ago
Spring Buildmaster	a5864ebcd0	Next development version	11 years ago
Spring Buildmaster	15e9dbe98b	Next development version	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
Phillip Webb	aca67066bf	Rename RestTemplates to TestRestTemplate ... Rename the RestTemplates to TestRestTemplate to help indicate that it's primarily intended for testing. Also now extend RestTemplate to allow direct use, rather than via factory methods. Fixes gh-599	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	a20f8b4be0	Add missing JQuery and Bootstrap dependencies ... Fixes #531	11 years ago
Phillip Webb	08b9592606	Polish spaces -> tabs	11 years ago
Dave Syer	a8ba80bbf4	Add build.gradle samples and docs for deployable WAR ... Fixes gh-518	11 years ago
Phillip Webb	80ac1fb0cd	Polish	11 years ago
Dave Syer	7a285cf65d	Convert all sample tests to @IntegrationTest where appropriate ... Makes them a lot more readable IMO, and also enables @Autowiring from the context into the test case (sweeet). I added @DirtiesContext to all of them as well to be on the safe side, but possbly that can be optimized in some way as well.	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
Spring Buildmaster	1367d57e8c	Next development version	11 years ago
Spring Buildmaster	eaff1677a7	Release version 1.0.0.RC3	11 years ago
Phillip Webb	4a58171b5c	A few more package tweaks ... Improve package structure and include package-info javadoc.	11 years ago
Phillip Webb	0160760568	Apply latest eclipse cleanup rules	11 years ago
Phillip Webb	68293f34af	Upgrade version to 1.0.0.BUILD-SNAPSHOT ... Fixes fg-243	11 years ago