Phillip Webb
be3fe12cf0
Polish
2016-12-30 11:46:24 -08:00
Spring Buildmaster
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
Spring Buildmaster
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
Stephane Nicoll
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
Stephane Nicoll
6bd670edbc
Initiate 1.4.x branch
2016-09-21 11:11:24 +02:00
Spring Buildmaster
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +00:00
Spring Buildmaster
5f959b074f
Next Development Version
2016-09-20 20:20:06 +00:00
Spring Buildmaster
334baaeffd
Next development version
2016-07-28 19:54:01 +00:00
Spring Buildmaster
a89ef5df6e
Next Development Version
2016-07-28 09:18:40 +00:00
Spring Buildmaster
2216369348
Next Development Version
2016-07-04 14:15:02 +00:00
Spring Buildmaster
819a9574a6
Next Development Version
2016-05-10 05:28:34 +00:00
Andy Wilkinson
3348ed5bb3
Make use of new GetMapping and PostMapping annotations
...
Closes gh-5277
2016-05-09 17:08:16 +01:00
Spring Buildmaster
376bbe68d8
Next Development Version
2016-05-06 11:23:57 +00:00
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
2016-04-28 12:45:15 -07:00
Phillip Webb
b398b3319c
Rename @SpringApplicationTest -> @SpringBootTest
...
Rename @SpringApplicationTest to SpringBootTest and
@SpringApplicationContextLoader to @SpringBootContextLoader.
Fixes gh-5562
2016-04-04 22:36:58 -07:00
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
2016-03-31 21:35:10 -07:00
Phillip Webb
0829a1bde8
Drop superfluous annotations
...
Update internal tests to drop annotations that can now
be inferred.
Fixes gh-5470
2016-03-23 22:19:36 -07:00
Phillip Webb
c28f552883
Migrate SpringJUnit4ClassRunner to SpringRunner
...
Replace all existing SpringJUnit4ClassRunner references with the new
SpringRunner alias.
Fixes gh-5292
2016-03-23 22:18:18 -07:00
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
2016-03-23 22:17:50 -07:00
Stephane Nicoll
2526a54e31
Polish contribution
...
Closes gh-5337
2016-03-14 14:24:24 +01:00
Spring Buildmaster
225d877ab9
Next Development Version
2016-02-26 01:06:16 -08:00
Andy Wilkinson
44ddfcc7fa
Upgrade copyright headers of all files changed in 2016
2016-02-25 12:09:42 +00:00
Phillip Webb
1cc1fc6431
Use AssertJ in spring-boot-samples
...
See gh-5083
2016-02-06 15:51:26 -08:00
Phillip Webb
fbaf209240
Move master to 1.4.0.BUILD-SNAPSHOT
2016-01-24 10:45:24 -08:00
Spring Buildmaster
504d3e97ba
Next development version
2016-01-21 18:41:30 -08:00
Spring Buildmaster
8db59059a5
Next Development Version
2015-12-18 05:43:02 -08:00
Stephane Nicoll
f269383803
Polish contribution
...
Closes gh-4770
2015-12-14 14:49:22 +01:00
David Morley
288aa962c4
Rename method to clarify which connector is being created
...
See gh-4770
2015-12-14 14:44:48 +01:00
Spring Buildmaster
3f6f57a80e
Next Development Version
2015-11-16 03:18:54 -08:00
Andy Wilkinson
248fcbec5d
Merge branch '1.2.x'
2015-10-30 09:06:58 +00:00
Andy Wilkinson
05b501ce41
Update Tomcat multi-connectors sample to configure SSL declaratively
...
The documentation recommends configuring the HTTP connector in code
and using application.properties to configure the HTTPS connector
as it's easier. This commit updates the sample to follow that
recommendation.
Closes gh-4342
2015-10-30 09:05:24 +00:00
Huang YunKun
1c5e445554
Update the samples to use @WebIntegrationTest and randomPort=true
...
Closes gh-4294
Closes gh-4271
2015-10-27 11:56:01 +00:00
Phillip Webb
1e4d974ec0
Merge remote-tracking branch 'local12x/1.2.x'
2015-10-19 12:56:55 -07:00
Phillip Webb
a79131f8d2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:55:44 -07:00
Spring Buildmaster
2b38a861e3
Next Development Version
2015-10-16 05:57:24 -07:00
Phillip Webb
e473364e4e
Merge branch '1.2.x'
2015-10-07 23:34:08 -07:00
Phillip Webb
6ab376e2e8
Reformat code use Eclipse Mars
2015-10-07 23:32:31 -07:00
Spring Buildmaster
9409c49c10
Next development version
2015-09-16 09:00:17 -07:00
Phillip Webb
2615990ffb
Organize imports
2015-09-08 14:40:35 -07:00
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
2015-08-19 17:09:34 +02:00
Spring Buildmaster
7ce391db4f
Next development version
2015-07-01 22:48:01 -07:00
Phillip Webb
61fc4f3f12
Polish copyright headers
2015-06-23 10:22:14 -07:00
Phillip Webb
1ce617f1ae
Polish sample package names
2015-06-23 00:47:12 -07:00
Spring Buildmaster
5d81c87b43
Next Development Version
2015-06-04 00:49:11 -07:00
Andy Wilkinson
2085a5b0cf
Work around the behaviour change in latest Spring 4.2 snapshots
...
The changes made in spring-projects/spring-framework@e403aefe cause
SampleTomcatTwoConnectorsApplication to fail to launch. The port bean,
typed as an int, is coerced into an Integer when the bean’s created. The
port() method is then called, and the proxy’s bean method interceptor
complains as it’s expecting the port bean to be an int but it’s actually
an Integer. Changing the port() bean method’s return type to Integer
works around the problem.
2015-04-16 11:00:12 +01:00
Spring Buildmaster
e03c11dda8
Next development version
2015-03-30 22:56:20 -07:00
Phillip Webb
a57a88f5cf
Move master to 1.3.0.BUILD-SNAPSHOT
2015-02-26 17:01:02 -08:00
Spring Buildmaster
8f0ad02237
Next development version
2015-02-26 15:26:53 -08:00
Spring Buildmaster
60725cd8bd
Next development version
2015-01-07 23:37:07 -08:00
Spring Buildmaster
1a788c1741
Next development version
2014-12-10 16:35:50 -08:00
Phillip Webb
a641f0c72a
Polish
2014-11-18 15:45:14 -08:00
Phillip Webb
d039f43107
Update samples to use @SpringBootApplication
...
Update the relevant samples to use the new @SpringBootApplication
annotation.
Closes gh-1842
2014-11-06 22:51:09 -08:00
Stephane Nicoll
249e09d9bc
Switch master to 1.2.0.BUILD-SNAPSHOT
2014-07-11 10:44:05 +02:00
Spring Buildmaster
40327e1ae6
Next development version
2014-07-08 02:33:36 -07:00
Phillip Webb
fa88c481a5
Remote trailing whitespace
2014-07-02 15:17:14 -07:00
Spring Buildmaster
981669b7c0
Next development version
2014-06-26 14:09:54 -07:00
Phillip Webb
200cd535c2
Revert "Next development version"
...
This reverts commit 67189477fe
.
2014-06-26 11:03:09 -07:00
Spring Buildmaster
67189477fe
Next development version
2014-06-26 10:51:35 -07:00
Spring Buildmaster
542f3cbda8
Next development version
2014-06-24 13:53:56 -07:00
Spring Buildmaster
4ca26a21dc
Next development version
2014-06-11 10:46:27 -07:00
Spring Buildmaster
05ed7b3bcd
Next development version
2014-06-10 12:40:35 -07:00
Phillip Webb
3007a777d0
Roll back to 1.1.0.BUILD-SNAPSHOT
2014-06-10 09:00:08 -07:00
Spring Buildmaster
c650f2391e
Next development version
2014-06-09 21:55:19 -07:00
Phillip Webb
64a835e91a
Move master to 1.1.0.BUILD-SNAPSHOT
2014-04-24 12:45:20 +01:00
Spring Buildmaster
d3954a1703
Next development version
2014-04-24 02:24:28 -07:00
Phillip Webb
4119ef5cf4
Use random ports for tests
...
Update remaining tests to use random ports.
Fixes gh-337
2014-04-23 19:11:54 +01:00
Spring Buildmaster
a5864ebcd0
Next development version
2014-04-06 22:43:18 -07:00
Spring Buildmaster
15e9dbe98b
Next development version
2014-04-01 03:05:51 -07:00
Phillip Webb
1e68b7e0a9
Remove superfluous <packaging> tags from POMs
2014-04-01 02:07:43 -07:00
Phillip Webb
0af7f7e347
Add missing POM info
2014-04-01 02:07:42 -07:00
Phillip Webb
6f9bb233ad
Revert "Next development version"
...
This reverts commit b67bb70ee3
.
2014-04-01 00:38:48 -07:00
Spring Buildmaster
b67bb70ee3
Next development version
2014-03-31 22:38:42 -07:00
Phillip Webb
ac4cdd33c3
Revert "Next development version"
...
This reverts commit 1d0eea12eb
.
Returning to 1.0.0.BUILD-SNAPSHOT for an updated release.
2014-03-31 17:14:30 -07:00
Spring Buildmaster
1d0eea12eb
Next development version
2014-03-28 11:47:09 -07:00
brockwmills
8b77a0298f
Allow multiple connectors with Tomcat
...
Update TomcatEmbeddedServletContainerFactory to allow for additional
containers (e.g. SSL or AJP in addition to HTTP).
Fixes gh-528
2014-03-21 11:10:11 -07:00