aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
1db1c8b03c
Validate our own tests work with JUnit5 and the vintage engine
...
Closes gh-14737
Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-05-08 16:05:44 +02:00
ddbfb2530d
Update copyright header of changed files
2019-04-03 17:01:00 -07:00
ad7eebee9e
Merge branch '2.1.x'
2019-04-03 17:00:25 -07:00
f12ab1ff90
Update copyright header of changed files
2019-04-03 16:13:00 -07:00
35d7fccb33
Update samples to use configuration properties scanning
...
Closes gh-12602
2019-03-21 13:30:45 -07:00
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
4b6bddd476
Merge branch '1.4.x' into 1.5.x
2019-03-20 16:30:04 +00:00
6920c39349
Merge branch '1.3.x' into 1.4.x
2019-03-20 15:06:50 +00:00
0e009ef047
Use HTTPS to link to the Apache license
2019-03-20 15:00:10 +00:00
68bfb020aa
Reduce need for bean method proxying and disable where not needed
...
Closes gh-9068
2019-03-12 13:18:42 +00:00
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
ac77fc9dcf
Ignore .writing files in Integration samples tests
...
Previously, a temporary .writing file could be found and an attempt made to
access its contents. If the temporary file was deleted between it being found
and its contents being read, the test would fail with a FileNotFoundException.
This commit updates the test to ignore .writing files so that it will only
examine the contents of the final file once Integration has finished
writing it an atomically moved it to its final location.
2018-11-27 11:24:25 +00:00
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
4853477081
Reformat code
2018-05-25 18:17:37 -07:00
adfb6dc128
Polish
2018-01-25 13:20:29 -08:00
d65f9b25bc
Remove redundant throws Exception
2018-01-25 17:25:38 +05:30
1fdc1e373c
Polish
2017-12-13 15:43:30 +01:00
23218add90
Polish
2017-12-12 11:57:30 +01:00
c3bc32db02
Polish and reinstate usage of FileSystemUtils.deleteRecursively
...
Closes gh-9942
2017-09-21 12:03:51 +01:00
a57e6495dd
Migrate from FileSystemUtils.deleteRecursively
...
Update test to migrate away from the now deprecated FileSystemUtils.
2017-07-18 20:22:24 -07:00
d5438c299c
Polish "Use try-with-resources to close resources automatically"
...
- Apply code formatting
- Use try-with-resources in many other places that were missed in the
pull request
Closes gh-8045
2017-05-23 19:38:48 +01:00
a4bcd20b64
Merge branch '1.5.x'
2017-02-27 20:43:18 -08:00
ca1540cefe
Update header copyright for changed files
2017-02-27 20:41:18 -08:00
5036fc50fc
Merge branch '1.5.x'
2017-01-17 21:17:03 +00:00
29adf2d85e
Ensure that test closes InputStream that reads contents of output files
2017-01-17 21:16:20 +00:00
467350a65d
Merge branch '1.5.x'
2017-01-17 14:27:02 +00:00
ed18478054
Give FileWritingMessageHandler more time to sort itself out
...
See 3927dca3
2017-01-17 14:26:14 +00:00
1ad7a66f03
Merge branch '1.5.x'
2017-01-17 11:53:14 +00:00
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
4604bb7e8a
Merge branch '1.5.x'
2016-12-30 18:01:59 +01:00
c903ff46a7
Polish samples
2016-12-30 17:57:14 +01:00
6e02fe59f7
Merge branch '1.5.x'
2016-12-21 22:32:43 -08:00
982f41b70c
Polish @IntegrationComponentScan auto-configuration
...
See gh-2037
See gh-7718
2016-12-21 22:22:50 -08:00
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
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
44ddfcc7fa
Upgrade copyright headers of all files changed in 2016
2016-02-25 12:09:42 +00:00
3b068c8bc2
Upgrade to Spring Integration 4.3.0.M1
...
Closes gh-5163
2016-02-17 16:42:39 +00:00
1cc1fc6431
Use AssertJ in spring-boot-samples
...
See gh-5083
2016-02-06 15:51:26 -08:00
1e4d974ec0
Merge remote-tracking branch 'local12x/1.2.x'
2015-10-19 12:56:55 -07:00
a79131f8d2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:55:44 -07:00
e473364e4e
Merge branch '1.2.x'
2015-10-07 23:34:08 -07:00
6ab376e2e8
Reformat code use Eclipse Mars
2015-10-07 23:32:31 -07:00
681894a1f3
Start building against Spring Integration 4.2.0 snapshots
...
See gh-2883
2015-04-27 13:44:17 +01:00
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
Madhura Bhave
Phillip Webb
Stephane Nicoll