Commit Graph

467 Commits

Author SHA1 Message Date
Gary Russell
2cef858480 Fix Link in README 2017-12-29 15:36:56 -05:00
The Alchemist
26ece34c3d Fix URL to Spring Flo 2017-12-14 09:04:35 -08:00
Artem Bilan
bbcb4bcfae Upgrade to SIK-3.0
* Fix Kafka Java DSL sample from bean name conflict
* Fix usage of deprecated `org.springframework.integration.test.util.SocketUtils`
2017-11-30 20:37:49 -05:00
Artem Bilan
38202d8b1f Upgrade to SI-5.0-GA, SS-5.0-GA, SF-5.0.2, SK-2.0
Remove exclude for the `TwitterAutoConfiguration` since it doesn't
exist in Spring Boot any more
2017-11-28 15:48:06 -05:00
Artem Bilan
77477a953d Fix compatibility with the latest Spring Boot
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2287
2017-11-27 10:39:48 -05:00
Artem Bilan
f09f4563d9 Use cacheConsumers=false for CachingJmsCF
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2256

The `AggregatorDemoTest` fails sporadically with no second part from
reply.
That might be as a result of the cached consumers in the
`CachingConnectionFactory`, so several `<int-jms:inbound-gateway>`
for the topic using the same connectionFactory essentially end up
using the same consumer sequentially.
And Broker considers them as a single consumer, therefore only one
message is sent.
2017-10-23 10:35:54 -04:00
Artem Bilan
f97ea5b988 Use mainClassName instead of main for bootRun task 2017-10-20 14:41:00 -04:00
Artem Bilan
107ef1f305 Remove EclipseLink from JPA sample
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2239/

Having Hibernate and EclipseLink in the same application isn't a goal.
On the other hand the sample must be concentrate on the Spring Integration,
not a complexity brought by the Spring Boot auto-configuration override.

* Remove the EclipseLink support from the JPA samples and rely only on
the Hibernate auto-configuration
* Remove an appropriate message from the README
2017-10-04 13:09:33 -04:00
Artem Bilan
6ce495e427 Upgrade to Mockito-2.10.0 and appropriate fixes 2017-09-21 15:46:21 -04:00
Gary Russell
e8fc589c5d Upgrade Several Versions 2017-09-14 10:51:38 -04:00
Gary Russell
c686666077 Upgrade to gradle 4.1 2017-09-07 17:31:45 -04:00
Artem Bilan
6bf5391715 Upgrade to ActiveMQ-5.15.0 and increase test time
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2211

It isn't clear why second message copy is lost, so increase timeout
in case of some fluctuations in the ActiveMQ.
Also increase logging level to DEBUG to see some info in the next failure
2017-09-06 20:19:08 -04:00
Gary Russell
e37904128e INTSAMPLES-150: Switch to Log4j2
JIRA: https://jira.spring.io/browse/INTSAMPLES-150
2017-09-01 16:14:34 -04:00
Artem Bilan
68377fedd1 Exclude jackson-module-kotlin to avoid CP issue
The `Jackson2JsonObjectMapper` tries to load any available modules for
the Jackson `ObjectMapper` via `findAndRegisterModules()`.

But if we have a module but don't have a target library, we end up with
the `ClassNotFoundException`.
In our case we fail with the Kotlin because Spring Boot provides
`com.fasterxml.jackson.module:jackson-module-kotlin` dependency and
leaves the rest of required libs for the target application.

* Exclude `com.fasterxml.jackson.module:jackson-module-kotlin`
from all the dependencies.
* Spring Integration `Jackson2JsonObjectMapper` should be revised to use
`Jackson2ObjectMapperBuilder` - https://jira.spring.io/browse/INT-4318
2017-07-27 12:11:10 -04:00
Artem Bilan
fe60be8a18 Upgrade dependencies to latest Milestones
Upgrade to Gradle 4.0.1
2017-07-25 14:06:06 -04:00
Artem Bilan
403650f6cd Fix compatibility with the latest SI 2017-07-21 10:38:27 -04:00
Artem Bilan
695a5440d4 Upgrade to SF-5.0.B-S to avoid CP confuses 2017-07-14 13:07:49 -04:00
Artem Bilan
2ccc8f426c Fix compatibility with the latest Spring Boot
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2099/
2017-05-17 11:50:17 -04:00
Artem Bilan
e1be51feb1 Upgrade to SK-2.0 M2 and SF-5.0 RC1
Fix `JmsMockTests` for wrong mock usage - just `reset()` before testing!
2017-05-12 11:04:20 -04:00
Artem Bilan
be0e24aea5 Fix JmsMockTests for bad Mockito usage
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2074

Upgrade to SK-2.0 M1 and SIK-3.0 M1

Fix JPA sample adding `SEQUENCE HIBERNATE_SEQUENCE` DDL
into the `schema.sql`

https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2078/

The latest Hibernate version doesn't create such a DB entity if
we use `hibernate.ddl-auto: none`

Increase timeouts in the JMS and TCP tests
2017-04-27 16:19:02 -04:00
Gary Russell
fdb9ddceeb Upgrade to Gradle 3.5 2017-04-26 11:21:01 -04:00
Santiago Castro
d7a77b75ac Fix broken Markdown headings 2017-04-16 16:32:52 -04:00
Artem Bilan
13c22ceb28 FTP Outbound test: use CachingSessionFactory
https://build.spring.io/browse/INTSAMPLES-NIGHTLY
2017-04-11 12:56:20 -04:00
Artem Bilan
5956cf8cfb Fix FTP sample tests to use bigger idle
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2059/

Fix `JmsMockTests` stubbing via making endpoint stopped before mocking

Force SI and SF versions via their BOMs imports
Regenerate POMs including `dependencyManagement` for BOMs customization
2017-04-11 11:56:08 -04:00
Artem Bilan
2b80cf25a8 Upgrade to SI-5.0 M3
* Fix Spring Boot 2.0 B-S compatibility
* Fix deprecation warnings
* regenerate POMs according new dependency versions
2017-04-05 17:09:49 -04:00
Artem Bilan
ea919aa4be GH-198: (S)FTP Server: Use an OS-selected Port
Fixes spring-projects/spring-integration-samples#198

The `SocketUtils.findAvailableServerSocket()` isn't reliable for port selection and its `socket.close()` may cause a port selection by some other process.

Use OS-selected port for SshdServer in SFTP sample

Revert unexpected refactoring after renaming properties

Upgrade to SSHD-1.4, FTP Server 1.1,  fix tests and Boot 2.0 compatibility
2017-03-14 12:16:25 -04:00
Gary Russell
a198e45239 Kafka_DSL Sample Improvements
- get rid of topic creator and scala deps
- use boot properties
- demonstrate using the DSL to dynamically add adapters
2017-02-02 13:42:51 -05:00
Gary Russell
038ee4576a Kafka Sample Improvements
- get rid of topic creator and scala deps
- use boot properties
- demonstrate using the DSL to dynamically add adapters
2017-02-02 12:11:16 -05:00
Gary Russell
65368f7959 5.0 README 2017-01-26 13:39:26 -05:00
Artem Bilan
a21a2444ef Change Kafka Samples to use Boot auto-config
Remove `@IntegrationComponentScan` from Boot samples

Since the latest Spring Boot utilize already `@IntegrationComponentScan` for the `@SpringBootApplication` class package, there is no reason to worry about lost `@MessagingGateway`

Reflect Kafka samples changes according latest Spring Boot fixes
2017-01-16 13:23:50 -05:00
Artem Bilan
dba0ee6112 Fix Spring Boot 2.0 compatibility
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-1965/
2016-12-30 09:55:03 -05:00
Artem Bilan
812686e1bc Change dependencies order for jpa sample
Since both `hibernate-jpa-2.1-api` and `org.eclipse.persistence.jpa` have similar classes in the same packages ensure that `hibernate-jpa-2.1-api` loads first to meet JPA-2.1 spec requirements in the Hibernate 5.2.5
2016-12-19 11:16:00 -05:00
Artem Bilan
04ef89784f Upgrade to SI-5.0.0.M1 2016-12-01 17:21:42 -05:00
Artem Bilan
69a896df00 Fix Kafka-0.10.1.0 compatibility
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-JOB1-1923/
2016-11-18 22:25:51 -05:00
Artem Bilan
5f524dc534 Upgrade to SI-5.0 & SIK-3.0, Reactor 3.0
* Fix compatibility after Java DSL migration to the SI Core
* Also upgrade all the JMS sample to the JMS 2.0
* Fix default `connectionFactory` bean reference to the current `jmsConnectionFactory`
* Remove unsupported JPA-1.0 Spec via `OpenJpaAutoConfiguration`, since the minimum now is JPA-2.0
* Remove non-lambda sample since minimum now is Java 8
* Rename `PromiseTest` to `MonoTest` and fix it to Reactor 3.0
* Fix `stomp-server.xml` to use proper Reactor 3.0 `eactor.util.function.Tuples` for SpEL
* Regenerate POMs
2016-11-18 14:11:32 -05:00
Artem Bilan
a6bf188099 regenerate POMs 2016-11-11 13:46:03 -05:00
Artem Bilan
239f4b27b5 Upgrade to SI-4.3.6
Remove SI-5.0 dependency and use `TestMailServer` from the SI-test since 4.3.6
2016-11-11 13:08:11 -05:00
Artem Bilan
6ffb17fe1e Upgrade to SI-Java-DSL-1.2.1 2016-11-08 08:29:13 -05:00
Artem Bilan
ae2e18dad6 Upgrade to SI-4.3.5 2016-11-07 18:08:59 -05:00
Artem Bilan
e35d441691 File-split-ftp: fix read files race condition
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-1898/

There is no guarantee that if `File.exists()`, the real write to file has occurred

 * Add `while()` to check not only `File.exists()` but also its `length()` only after that proceed to assert logic
2016-10-25 10:34:54 -04:00
Gary Russell
171dd51024 Update file-split-ftp Visualization 2016-10-14 14:21:07 -04:00
Artem Bilan
ef31a187c4 Revert usage for fileNameExpression
Since we provide a custom `FileNameGenerator` via `fileNameExpression` we should ensure somehow `BeanFactory` injection to that
`FileWritingMessageHandlerSpec` is a `FactoryBean` since version DSL `1.2` and a particular `BPP` takes care about `Spec` internals and register custom `FileNameGenerator` as a bean.

 Use standard `FactoryBean` injection in the `lines()` flow to populate the target `FileWritingMessageHandler` to the flow
Generate pom for all project to apply SI Java DSL 1.2 GA
2016-10-14 13:28:27 -04:00
Artem Bilan
a9d653b19e Upgrade to SI-Java_DSL-1.2.RELEASE
Fixes GH-180 (https://github.com/spring-projects/spring-integration-samples/issues/180)

* Apply `PollerSpec.errorChannel(String)` style
* Replace `fileNameExpression()` to `fileNameGenerator()` to avoid `No BeanFactory` for `EvaluationContext`
* Use `.trigger()` instead of `.handle()` for `FileWritingMessageHandler.trigger()`
* Fix race condition in test, when file exists already, but there is no content yet
2016-10-14 12:57:42 -04:00
Gary Russell
948e5135cd Generate POMs 2016-10-14 11:35:47 -04:00
Gary Russell
933b3f015a file-split-ftp Move errorChannel to Poller 2016-10-13 17:22:33 -04:00
Gary Russell
b3bab0dea2 Revert "file-split-ftp Move errorChannel to Poller"
This reverts commit 7b84810388.
2016-10-13 17:21:49 -04:00
Gary Russell
7b84810388 file-split-ftp Move errorChannel to Poller 2016-10-13 17:18:17 -04:00
Gary Russell
42294bf831 Update to Spring Integration 4.3.4 2016-10-03 13:40:18 -04:00
Gary Russell
4e37b9ad5c Update to Spring Integration 4.3.3 2016-09-30 15:25:22 -04:00
Artem Bilan
62894391b5 Upgrade to SI-Java_DSL-1.2.RC1 2016-09-27 13:45:14 -04:00