Phillip Webb
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
Phillip Webb
e69296d7d3
Fix checkstyle violations in samples
2018-05-25 18:18:00 -07:00
Spring Buildmaster
010b4fccbd
Next development version
2018-05-09 09:31:46 +00:00
Spring Buildmaster
c10aad165f
Next Development Version
2018-04-09 23:14:33 +00:00
Spring Buildmaster
ade4760842
Next Development Version
2018-04-05 09:01:52 +00:00
Spring Buildmaster
6414b42335
Next Development Version
2018-01-30 23:29:33 +00:00
Phillip Webb
adfb6dc128
Polish
2018-01-25 13:20:29 -08:00
Madhura Bhave
d65f9b25bc
Remove redundant throws Exception
2018-01-25 17:25:38 +05:30
Stephane Nicoll
23218add90
Polish
2017-12-12 11:57:30 +01:00
Johnny Lim
6d54072e04
Remove "final" keywords
...
Closes gh-11294
2017-12-08 11:13:07 -08:00
Spring Buildmaster
df2ae7aa19
Next Development Version
2017-11-28 09:55:46 +00:00
Spring Buildmaster
c0f9f64776
Next Development Version
2017-10-16 12:36:43 +00:00
Phillip Webb
2855010841
Fix sample POMs
...
Update sample POMs to follow CI friendly Maven conventions.
See gh-9316
2017-10-04 16:34:39 -07:00
Spring Buildmaster
30eb937a83
Next Development Version
2017-09-12 10:54:22 +00:00
Spring Buildmaster
17a5bb0be4
Next development version
2017-07-27 08:00:21 +00:00
Spring Buildmaster
41c5c0e7c9
Next development version
2017-07-26 08:30:55 +00:00
Johnny Lim
360e3a492c
Polish
...
closes gh-9729
2017-07-12 13:25:19 +02:00
Phillip Webb
8e3baf3130
Polish
2017-07-11 13:57:21 -07:00
Andy Wilkinson
4a030d5a7a
Drop support for auto-configuring an embedded Elasticsearch node
...
Elastic have announced [1] that embedded Elasticsearch is no longer
supported. This commit brings us into line with that announcement by
removing the auto-configuration that would create an Elasticsearch
Node and NodeClient.
To use the Elasticsearch auto-configuration, a user must now provide
the address of one or more cluster nodes
(via the spring.elastisearch.cluster-nodes property) which will then
be used to create a TransportClient.
See gh-9374
[1] https://www.elastic.co/blog/elasticsearch-the-server
2017-06-15 19:52:24 +01:00
Spring Buildmaster
05d4d0281c
Next Development Version
2017-06-08 12:47:16 +00:00
Spring Buildmaster
9768b0a8c2
Next Development Version
2017-04-21 08:32:01 +00:00
Spring Buildmaster
d23fa24340
Next Development Version
2017-03-03 16:18:26 +00:00
Spring Buildmaster
5c12500366
Next Development Version
2017-01-30 20:10:13 +00:00
Spring Buildmaster
a2696bf873
Next Development Version
2017-01-30 11:40:24 +00:00
Phillip Webb
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
Phillip Webb
be3fe12cf0
Polish
2016-12-30 11:46:24 -08:00
Stephane Nicoll
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
Spring Buildmaster
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +00:00
Spring Buildmaster
334baaeffd
Next development version
2016-07-28 19:54:01 +00:00
Andy Wilkinson
ccd19ce2c3
Merge branch '1.3.x'
2016-05-24 17:25:15 +01:00
Andy Wilkinson
275651e89a
Skips Cassandra and Elasticsearch tests on Windows
...
Neither Cassandra nor Elasticsearch starts reliably on Windows. This
commit adds a custom class rule to the associated sample application
tests to skip them on Windows. A class rule is used rather than a
Unit assumption as we want to avoid starting Elasticsearch (done by
the application context) and Cassandra (done by a test execution
listener) and an assumption would be too late.
2016-05-24 17:22:48 +01:00
Johnny Lim
38dc9ec441
Polish
2016-05-10 14:48:42 +01:00
Spring Buildmaster
819a9574a6
Next Development Version
2016-05-10 05:28:34 +00:00
Spring Buildmaster
376bbe68d8
Next Development Version
2016-05-06 11:23:57 +00:00
Phillip Webb
944a49bd58
Tweak Elasticsearch sample timeout
2016-04-11 11:07:37 -07:00
Stephane Nicoll
05ef0818f8
Polish contribution
...
Closes gh-5511
2016-04-05 12:38:04 +02:00
Huang YunKun
6a2ff3f02a
Upgrade elasticsearch to 2.2.0
...
Closes gh-5443
2016-04-05 12:38:04 +02: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
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
Spring Buildmaster
3f6f57a80e
Next Development Version
2015-11-16 03:18:54 -08: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
Spring Buildmaster
9409c49c10
Next development version
2015-09-16 09:00:17 -07:00
Spring Buildmaster
7ce391db4f
Next development version
2015-07-01 22:48:01 -07:00