220 Commits (9f191661d4bc5ae1e515f68960921c079aa0f70e)

Author	SHA1	Message	Date
Phillip Webb	be3fe12cf0	Polish	8 years ago
Andy Wilkinson	fe10ea73b0	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	ad3e5c04bb	Add a second, portal-compatible ID to the Gradle plugin ... To be compatible with Gradle's plugin portal, plugins must have an ID that uses a reverse domain name. This means that spring-boot is not compatible. This commit introduces a new ID, org.springframework.boot, and deprecates the old ID. Closes gh-6997	8 years ago
Andy Wilkinson	f137ec6a3a	Merge branch '1.5.x'	8 years ago
Andy Wilkinson	846f264da8	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	77f1da871f	Add a second, portal-compatible ID to the Gradle plugin ... To be compatible with Gradle's plugin portal, plugins must have an ID that uses a reverse domain name. This means that spring-boot is not compatible. This commit introduces a new ID, org.springframework.boot, and deprecates the old ID. Closes gh-6997	8 years ago
Stephane Nicoll	6643ec3713	Next development version	8 years ago
Stephane Nicoll	6bd670edbc	Initiate 1.4.x branch	8 years ago
Stephane Nicoll	97083300d7	Fixup version numbers following release	8 years ago
Spring Buildmaster	7e9ed5e1a7	Next Development Version	8 years ago
Andy Wilkinson	07a50bb16c	Update the samples to make use of auto-configured TestRestTemplate ... Closes gh-6730	8 years ago
Phillip Webb	c7a23eae56	Fixup version numbers following release	8 years ago
Spring Buildmaster	334baaeffd	Next development version	8 years ago
Andy Wilkinson	93307bbd5b	Merge branch '1.3.x'	9 years ago
Andy Wilkinson	17546628f5	Remove springloaded from samples ... springloaded isn't required in any of the samples, yet some of them make use of it without being a springloaded-specific sample. This is creating the false impression that springloaded is necessary in cases where it's not.	9 years ago
Stephane Nicoll	8cbbb577a0	Fixup version numbers following release	9 years ago
Spring Buildmaster	819a9574a6	Next Development Version	9 years ago
Andy Wilkinson	3348ed5bb3	Make use of new GetMapping and PostMapping annotations ... Closes gh-5277	9 years ago
Stephane Nicoll	72c2454218	Fixup version numbers following release	9 years ago
Spring Buildmaster	376bbe68d8	Next Development Version	9 years ago
Phillip Webb	a7cb689f95	Move @LocalServerPort annotation ... Move the @LocalServerPort to org.springframework.boot.context.embedded since it's only really useful when working with embedded servlet containers. See gh-5822	9 years ago
Phillip Webb	b398b3319c	Rename @SpringApplicationTest -> @SpringBootTest ... Rename @SpringApplicationTest to SpringBootTest and @SpringApplicationContextLoader to @SpringBootContextLoader. Fixes gh-5562	9 years ago
Andy Wilkinson	33f0ea3480	Rework SpringApplicationTest to support web modes ... Rework the new testing support so that @SpringApplicationTest can be used for standard integration tests, web integration tests with a mock Servlet environment and web integration tests with an embedded servlet container. This means that it a replacement for 1.3's @IntegrationTest and @WebIntegrationTest and allows all SpringApplication testing to be configured using a common annotation. The old @IntegrationTest and @WebIntegrationTest along with their supporting classes have been reinstated to their previous form (while remaining deprecated). This should ensure that they continue to work in 1.4 exactly as they did in 1.3 giving users a smooth path to @SpringApplicationTest. See gh-5477	9 years ago
Phillip Webb	0829a1bde8	Drop superfluous annotations ... Update internal tests to drop annotations that can now be inferred. Fixes gh-5470	9 years ago
Phillip Webb	c28f552883	Migrate SpringJUnit4ClassRunner to SpringRunner ... Replace all existing SpringJUnit4ClassRunner references with the new SpringRunner alias. Fixes gh-5292	9 years ago
Phillip Webb	2f815a907a	Migrate existing tests from deprecated package ... Update the existing tests to use the relocated `spring-boot-test` classes. Restructuring was achieved using the following command: find . -type f -name '*.java' -exec sed -i '' \ -e s/org.springframework.boot.test.ConfigFileApplicationContextInitializer/\ org.springframework.boot.test.context.ConfigFileApplicationContextInitializer/g \ -e s/org.springframework.boot.test.EnvironmentTestUtils/\ org.springframework.boot.test.util.EnvironmentTestUtils/g \ -e s/org.springframework.boot.test.IntegrationTest/\ org.springframework.boot.test.context.IntegrationTest/g \ -e s/org.springframework.boot.test.IntegrationTestPropertiesListener/\ org.springframework.boot.test.context.IntegrationTestPropertiesListener/g \ -e s/org.springframework.boot.test.OutputCapture/\ org.springframework.boot.test.rule.OutputCapture/g \ -e s/org.springframework.boot.test.SpringApplicationConfiguration/\ org.springframework.boot.test.context.SpringApplicationConfiguration/g \ -e s/org.springframework.boot.test.SpringApplicationContextLoader/\ org.springframework.boot.test.context.SpringApplicationContextLoader/g \ -e s/org.springframework.boot.test.SpringBootMockServletContext/\ org.springframework.boot.test.mock.web.SpringBootMockServletContext/g \ -e s/org.springframework.boot.test.TestRestTemplate/\ org.springframework.boot.test.web.client.TestRestTemplate/g \ -e s/org.springframework.boot.test.WebIntegrationTest/\ org.springframework.boot.test.context.web.WebIntegrationTest/g {} \; See gh-5293	9 years ago
Stephane Nicoll	2526a54e31	Polish contribution ... Closes gh-5337	9 years ago
Andy Wilkinson	355860fd09	Remove @Autowired from constructors where class has single constructor ... Closes gh-5226	9 years ago
Stephane Nicoll	5680ffdedb	Fixup version numbers following release	9 years ago
Spring Buildmaster	225d877ab9	Next Development Version	9 years ago
Phillip Webb	95c4cdbedc	Fix packages and annotations used in sample ... Update a few of the samples to correct the packages used in tests and to make use of the `@SpringBootApplication` annotation.	9 years ago
Phillip Webb	1cc1fc6431	Use AssertJ in spring-boot-samples ... See gh-5083	9 years ago
Phillip Webb	fbaf209240	Move master to 1.4.0.BUILD-SNAPSHOT	9 years ago
Phillip Webb	c77a7e0cba	Fixup version numbers following release	9 years ago
Spring Buildmaster	504d3e97ba	Next development version	9 years ago
Stephane Nicoll	ecf56f0708	Fixup version numbers following release	9 years ago
Spring Buildmaster	8db59059a5	Next Development Version	9 years ago
Phillip Webb	7f8aff0231	Format HTML in web-ui sample	9 years ago
kozazz	0de4b6ce63	Add update/delete to the web-ui sample ... Closes gh-4735 See gh-4733	9 years ago
Stephane Nicoll	14e7b10310	Fixup version numbers following release	9 years ago
Spring Buildmaster	3f6f57a80e	Next Development Version	9 years ago
Huang YunKun	1c5e445554	Update the samples to use @WebIntegrationTest and randomPort=true ... Closes gh-4294 Closes gh-4271	9 years ago
Phillip Webb	634bb770b2	Organize imports with new settings ... See gh-4234	9 years ago
Phillip Webb	1e4d974ec0	Merge remote-tracking branch 'local12x/1.2.x'	9 years ago
Phillip Webb	a79131f8d2	Organize imports with new settings ... See gh-4234	9 years ago
Spring Buildmaster	2b38a861e3	Next Development Version	9 years ago
Phillip Webb	e473364e4e	Merge branch '1.2.x'	9 years ago
Phillip Webb	6ab376e2e8	Reformat code use Eclipse Mars	9 years ago
Phillip Webb	d22d0683b2	Fixup build following release	9 years ago
Spring Buildmaster	9409c49c10	Next development version	9 years ago
Phillip Webb	d09805fd75	Polish license headers	9 years ago
Phillip Webb	2615990ffb	Organize imports	9 years ago
Stephane Nicoll	1dfa1fc3a5	Polish ... Closes gh-3800	9 years ago
Huang YunKun	3b81152ddc	Fix springloaded version ... Closes gh-3807	9 years ago
Stephane Nicoll	7c0c953f81	Add value alias for SpringApplicationConfiguration ... Given that Spring Boot uses java config accross the board, a new `value` attribute is now aliased to the existing `classes` attribute such that one could write the following: @SpringApplicationConfiguration(MyConfig.class) public class MyTest {} Closes gh-3635	9 years ago
Stephane Nicoll	7c3cdead28	Remove unnecessary mainClassName ... Since each sample has (supposedly) only one application class and not a lot of the code, the `mainClassName` attribute in the gradle build is not really useful and can lead to inconsistency if the application class is moved. See gh-3588	9 years ago
Justin Garrick	8960b88020	Fix package name of web-ui sample ... Closes gh-3588	9 years ago
Phillip Webb	43dc0c64c2	Fixup version numbers following release	10 years ago
Spring Buildmaster	7ce391db4f	Next development version	10 years ago
Phillip Webb	61fc4f3f12	Polish copyright headers	10 years ago
Phillip Webb	1ce617f1ae	Polish sample package names	10 years ago
Stephane Nicoll	b847b6fa4b	Fixup version numbers following release	10 years ago
Spring Buildmaster	5d81c87b43	Next Development Version	10 years ago
Andy Wilkinson	4452bb1873	Revert "Upgrade Gradle plugin’s ID so it’s suitable for the Plugin Portal" ... This reverts commit b1c0a7cda4. The plugin publishing process has moved to a new plugin-based approach that brings with it some significant limitations: - There's no staging to allow the promotion of good release builds - There's no easy way to upload an existing artifact - There's no control over the published pom. The risk brought by these limitations, particularly the first, are too great so we will no be publishing the Boot plugin to the Portal until they're resolved. Changing the plugin's ID was a breaking change that would require users to do some work when they upgrade to Boot 1.3. The ID of the plugin was changed purely so that it met the Portal's requirements. Given that the plugin will not be published to the Portal for the foreseaable future there's no need for us to inflict a breaking change on people when there will be no benefit. See gh-1567	10 years ago
Phillip Webb	42e69359a8	Fixup version numbers following release	10 years ago
Spring Buildmaster	e03c11dda8	Next development version	10 years ago
Andy Wilkinson	b1c0a7cda4	Upgrade Gradle plugin’s ID so it’s suitable for the Plugin Portal ... Gradle’s plugin portal requires each plugin’s ID to be in a namespace. Our existing ID, spring-boot, does not meet this requirement. This commit changes the plugin’s ID to org.springframework.boot.spring-boot. Note that, as is recommended [1], the plugin’s ID does not include “gradle”. See gh-1567 [1] http://plugins.gradle.org/submit	10 years ago
Phillip Webb	a57a88f5cf	Move master to 1.3.0.BUILD-SNAPSHOT	10 years ago
Phillip Webb	8ce39bda88	Fixup version numbers following release	10 years ago
Spring Buildmaster	8f0ad02237	Next development version	10 years ago
Stephane Nicoll	dfdb801533	Fix use of deprecated API.	10 years ago
Phillip Webb	9dd4d43cec	Fixup version numbers following release	10 years ago
Spring Buildmaster	60725cd8bd	Next development version	10 years ago
Phillip Webb	43fb5b63a8	Fixup version numbers following release	10 years ago
Spring Buildmaster	1a788c1741	Next development version	10 years ago
Phillip Webb	d039f43107	Update samples to use @SpringBootApplication ... Update the relevant samples to use the new @SpringBootApplication annotation. Closes gh-1842	10 years ago
Phillip Webb	a3527521a2	Also resolve favicon.ico from resource folders ... Update FaviconConfiguration to allow favicon.ico files to be resolved from static resource folders (/META-INF/resources, /resources, /static, /public) in addition to the root classpath. Fixes gh-1656	10 years ago
Andy Wilkinson	8e000f3da1	Merge branch '1.1.x'	10 years ago
Andy Wilkinson	b85926e6f0	Fix the rest of the typo InMemoryRepository's name	10 years ago
Andy Wilkinson	b8759ebf69	Merge branch '1.1.x'	10 years ago
matzschmanski	02fef4295d	Fix typo: InMemoryMessageRespository -> InMemoryMessageRepository ... Closes gh-1671	10 years ago
Phillip Webb	4f9258a345	Fixup version numbers following release	10 years ago
Spring Buildmaster	edb4b7ed7d	Next development version	10 years ago
Phillip Webb	338288205b	Fixup version numbers following release	10 years ago
Spring Buildmaster	d63e4b4329	Next development version	10 years ago
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
Dave Syer	772df9bea7	Add inputs to gradle bootRepackage task ... See gh-1113	11 years ago
Phillip Webb	143e1918b7	Fixup versions following release	11 years ago