Phillip Webb
fd67f7ba3f
Merge branch '1.5.x' into 2.0.x
2019-07-17 21:47:04 +01:00
Phillip Webb
8843c11a28
Update copyright header of changed files
2019-07-17 21:44:01 +01:00
Andy Wilkinson
9d28238598
Update formatting of spring-boot-samples
2019-06-08 08:16:44 +01:00
Andy Wilkinson
8f1be4cded
Upgrade to spring-javaformat 0.0.11
2019-06-07 09:44:58 +01:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Andy Wilkinson
4b6bddd476
Merge branch '1.4.x' into 1.5.x
2019-03-20 16:30:04 +00:00
Andy Wilkinson
6920c39349
Merge branch '1.3.x' into 1.4.x
2019-03-20 15:06:50 +00:00
Andy Wilkinson
0e009ef047
Use HTTPS to link to the Apache license
2019-03-20 15:00:10 +00:00
Andy Wilkinson
361437f4e2
Merge branch '1.5.x' into 2.0.x
2019-03-11 15:53:34 +00:00
Andy Wilkinson
821ee0cf83
Ensure that @Bean methods are only declared on @Configuration classes
...
Closes gh-16190
2019-03-11 15:01:59 +00:00
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
Phillip Webb
4853477081
Reformat code
2018-05-25 18:17:37 -07: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
Andy Wilkinson
fa22396dae
Merge branch '1.5.x'
2017-01-24 10:53:29 +00:00
Andy Wilkinson
1a69a4ff67
Remove unnecessary use of @Autowired in the samples
2017-01-24 10:52:50 +00:00
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
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
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
Andy Wilkinson
b9d7a39693
Update sample-parent-context following changes to integration starter
...
See gh-5528
2016-04-18 15:36:33 +01: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
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
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
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
Andy Wilkinson
681894a1f3
Start building against Spring Integration 4.2.0 snapshots
...
See gh-2883
2015-04-27 13:44:17 +01: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
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
Phillip Webb
b616e9fdc4
Rename SampleIntegrationApplicationTests
2014-10-06 10:47:40 -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
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
