Phillip Webb
ca1540cefe
Update header copyright for changed files
2017-02-27 20:41:18 -08: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
Spring Buildmaster
ed1ce140c0
Next Development Version
2017-01-26 14:20:39 +00:00
Andy Wilkinson
5036fc50fc
Merge branch '1.5.x'
2017-01-17 21:17:03 +00:00
Andy Wilkinson
29adf2d85e
Ensure that test closes InputStream that reads contents of output files
2017-01-17 21:16:20 +00:00
Andy Wilkinson
467350a65d
Merge branch '1.5.x'
2017-01-17 14:27:02 +00:00
Andy Wilkinson
ed18478054
Give FileWritingMessageHandler more time to sort itself out
...
See 3927dca3
2017-01-17 14:26:14 +00:00
Andy Wilkinson
1ad7a66f03
Merge branch '1.5.x'
2017-01-17 11:53:14 +00:00
Andy Wilkinson
3927dca3e0
Tolerate files being briefly left open by FileWritingMessageHandler
...
When the context is closed, FileWritingMessageHandler is stopped and
it closes its output files. However, it appears to do so in a manner
which means that they may be closed after the call to close the
context is completed. This causes problems on Windows as files that
are still open cannot be deleted.
This commit adds a workaround to SampleIntegrationApplicationTests
so that it makes up to 10 attempts each 0.5s apart to clean up the
input and output directories.
2017-01-17 11:48:57 +00:00
Phillip Webb
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
Phillip Webb
273beaa3ce
Polish
2016-12-30 11:10:44 -08:00
Stephane Nicoll
4604bb7e8a
Merge branch '1.5.x'
2016-12-30 18:01:59 +01:00
Stephane Nicoll
c903ff46a7
Polish samples
2016-12-30 17:57:14 +01:00
Stephane Nicoll
a19a28062f
Fix actuator security in samples
...
Closes gh-7637
2016-12-30 17:56:19 +01:00
Spring Buildmaster
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
Phillip Webb
6e02fe59f7
Merge branch '1.5.x'
2016-12-21 22:32:43 -08:00
Phillip Webb
982f41b70c
Polish @IntegrationComponentScan auto-configuration
...
See gh-2037
See gh-7718
2016-12-21 22:22:50 -08:00
Spring Buildmaster
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
Andy Wilkinson
4486d2d209
Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots
...
Closes gh-7301
See gh-7029
2016-11-03 20:49:02 +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
Stephane Nicoll
dcb4fe8304
Add JMX support to the Spring Integration starter
...
Closes gh-1440
2016-05-13 16:33:35 +02: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
Andy Wilkinson
c068285586
Streamline Integration Starter and add Java DSL to it
...
This commit streamlines the Integration Starter by removing the file
http, ip, and stream modules as they are not always used by a majority
of apps that use Spring Integration and can also pull in other, unwanted
dependencies.
Additionally, a dependency on spring-integration-java-dsl has been
added. This makes it easy for users to configure Spring Integration
using Java configuration (the recommended approach), rather than via
XML. The Integration sample has been updated to use the DSL. Further
improvements could be made once the sample is using Java 8.
Closes gh-5528
2016-04-18 14:55:35 +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
Andy Wilkinson
3b068c8bc2
Upgrade to Spring Integration 4.3.0.M1
...
Closes gh-5163
2016-02-17 16:42:39 +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
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
Spring Buildmaster
7ce391db4f
Next development version
2015-07-01 22:48:01 -07:00
Spring Buildmaster
5d81c87b43
Next Development Version
2015-06-04 00:49:11 -07:00
Andy Wilkinson
681894a1f3
Start building against Spring Integration 4.2.0 snapshots
...
See gh-2883
2015-04-27 13:44:17 +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
Phillip Webb
8e594c790e
Fix eclipse errors and warnings
...
Fix some eclipse errors and warnings caused by XSD validation errors and
classes in the wrong place.
2015-02-24 12:44:19 -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
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
Andy Wilkinson
6b1f76ad6b
Merge branch '1.1.x'
2014-10-20 11:20:56 +01:00
Andy Wilkinson
160d609bd4
Protect against race condition where output file exists but it is empty
...
Previously, there was a timing window where the output file had been
created but it was empty. This would cause the test to fail as the
output was read from the empty file and didn’t match the expected “Hello
World”.
This commit updates the test to only process the resources in the output
directory when all the resolved resources have a non-zero content
length. An @Before method has also been added to delete the output
produced by the test so that the outcome of the test isn’t affected by
files generated by previous runs.
Fixes gh-1735
2014-10-20 11:04:14 +01:00
Spring Buildmaster
3e71a21b30
Next development version
2014-10-10 15:19:47 -07:00
Spring Buildmaster
edb4b7ed7d
Next development version
2014-09-25 21:02:37 -07:00
Spring Buildmaster
d63e4b4329
Next development version
2014-09-04 12:15:18 -07:00
Spring Buildmaster
74d0c5185a
Next development version
2014-08-07 11:59:17 -07: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
Dave Syer
fd757cb371
Add logging.level to application.properties
...
E.g.
logging.level.org.springframework: DEBUG
logging.level.org.hibernate: WARN
Fixed gh-788
2014-06-27 15:49:17 +01: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
Dave Syer
36130b27e1
Support for Jmx (and Integration) autoconfig in parent contexts
...
When there are parent contexts we already had a strategy for registering
the actuator endpoints, but not the regular JMX or Integration MBeans.
This chnage makes the autoconfigs for JMX aware of the parent context.
Also adds a sample with a parent context.
See gh-847
2014-06-10 15:12:30 +01:00
Spring Buildmaster
c650f2391e
Next development version
2014-06-09 21:55:19 -07:00
Dave Syer
09200361de
Align expectations of various JMX configurations
...
They all want to create an MBeanServer and when that happens
user sees no MBeans, or sometimes just one set (Spring Core,
Spring Integration or Spring Boot). To harmonise them we
create a @Bean of type MBeanServer and link to it in the
other autoconfigs
Fixes gh-1046
2014-06-06 17:52:14 +01:00
Andy Wilkinson
733e12e215
Merge branch '1.0.x'
2014-05-21 16:38:24 +01:00
Andy Wilkinson
426c5680d4
Use Boot’s base Logback configuration in the Integration sample
...
Fixes #922
2014-05-21 16:38:02 +01: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
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
488b03387f
Polish POM formatting
2014-04-01 02:07:36 -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
Phillip Webb
d42bedf295
Rename @ConfigurationProperties attributes
...
Rename `name` to `prefix` and `path` to `locations`.
2014-03-24 11:44:52 -07:00
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.
2014-03-07 17:02:20 +00:00
Spring Buildmaster
b0d4e8ae69
Next development version
2014-03-03 22:46:12 -08:00
Spring Buildmaster
cb8668a151
Release version 1.0.0.RC4
2014-03-03 22:46:05 -08:00
Spring Buildmaster
1367d57e8c
Next development version
2014-02-13 13:19:12 -08:00
Spring Buildmaster
eaff1677a7
Release version 1.0.0.RC3
2014-02-13 13:18:56 -08:00
Phillip Webb
0160760568
Apply latest eclipse cleanup rules
2014-01-21 16:28:26 -08:00
Phillip Webb
68293f34af
Upgrade version to 1.0.0.BUILD-SNAPSHOT
...
Fixes fg-243
2014-01-21 00:43:54 -08:00
Dave Syer
559f907b54
Use explicit test dependencies in samples
2014-01-17 09:08:18 +00:00
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.
2013-12-31 08:40:26 +00:00
Phillip Webb
64f32893bb
Source format and clean-up
2013-11-16 00:08:18 -08:00
Phillip Webb
a33425920b
Rework POMs to support automated CI release
2013-09-05 22:05:29 -07:00