Phillip Webb
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
Phillip Webb
aacf5d660f
Update copyright year for changed files
2016-12-30 11:53:51 -08:00
Phillip Webb
be3fe12cf0
Polish
2016-12-30 11:46:24 -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
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
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
b9d7a39693
Update sample-parent-context following changes to integration starter
...
See gh-5528
2016-04-18 15:36:33 +01:00
Spring Buildmaster
225d877ab9
Next Development Version
2016-02-26 01:06:16 -08: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
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
c9fb9916b8
Reformat code using Eclipse Mars
2015-10-07 23:37:10 -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
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
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
Andy Wilkinson
c9186c45a2
Merge branch '1.1.x'
2015-01-29 13:39:16 +00:00
Andy Wilkinson
c346e996ed
Ignore temporary .writing files when finding output files
...
Spring Integration's FileWritingMessageHandler uses a .writing file
while it's in the process of writing a message to disk and then
performs a rename (depending on the OS and filesystem this may or may
not be atommic) to create the .msg file. Prior to this commit the
test was finding the temporary .writing files and examining them. This
could lead to a FileNotFoundException being thrown as the temporary
file was deleted while the test was trying to read its contents.
This commit updates the test to only look for files with a .msg suffix
Fixes gh-2428
2015-01-29 13:32:01 +00:00
Andy Wilkinson
1d312171c1
Merge branch '1.1.x'
2015-01-20 09:50:47 +00:00
Andy Wilkinson
f10c9b5312
Avoid race between file creation and its contents being written
...
Previously, SampleIntegrationParentApplicationTests assumed that when
an output file existed on disk its contents would have been written
in their entirety. This assumption does not hold true and causes the
test to fail intermittently as it incorrectly determines that the test
has produced no output.
This commit updates the test to wait for up to 30 seconds for the
output files to appear on disk and for the expected content to be
found in one of those files. If the files exist but do not
contain the expected content the test will keep trying until it does
or until too much time as elapsed.
Fixes gh-2380
2015-01-20 09:50:35 +00:00
Spring Buildmaster
60725cd8bd
Next development version
2015-01-07 23:37:07 -08:00
Phillip Webb
5afd0b4858
Polish sample POM names
2014-12-19 15:59:44 -08:00
Spring Buildmaster
63e6a25097
Next development version
2014-12-10 18:06:30 -08:00
Spring Buildmaster
1a788c1741
Next development version
2014-12-10 16:35:50 -08:00
Spring Buildmaster
46b7738334
Next development version
2014-11-11 17:12:24 -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
Spring Buildmaster
3e71a21b30
Next development version
2014-10-10 15:19:47 -07:00
Phillip Webb
09d5812c3b
Merge branch '1.1.x'
2014-10-06 11:07:28 -07:00
Phillip Webb
b616e9fdc4
Rename SampleIntegrationApplicationTests
2014-10-06 10:47:40 -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
Dave Syer
178386abc4
Merge branch '1.1.x'
2014-08-06 19:33:57 -07:00
Dave Syer
38f8d65756
Use ApplicationEvent to ensure that authentication event publisher is registered
...
There was a reference to an old (fixed) issue in Spring which led to some simplification
of the AuthenticationManager layering as well.
Fixes gh-1335
2014-08-06 19:30:27 -07:00
Andy Wilkinson
d04f325294
Merge branch '1.1.x'
2014-07-23 15:57:53 +01:00
Andy Wilkinson
7945b29669
Correct the descriptions of two sample projects
2014-07-23 15:57:44 +01: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
8054426803
Format source code
2014-07-02 15:17:25 -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
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