This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push: new 0706a72 Camel-reactive-streams-stater: Fixed build and regen 0706a72 is described below commit 0706a72a02a73cd2b0937ed613a21531470d981d Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon Jul 13 15:05:57 2020 +0200 Camel-reactive-streams-stater: Fixed build and regen --- components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++ components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++ .../test/support/ReactiveStreamsServiceTestSupport.java | 6 ++++++ tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index 254cb1b..7f14a21 100644 --- a/components-starter/camel-corda-starter/pom.xml +++ b/components-starter/camel-corda-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-corda</artifactId> <version>${camel-version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml index 9427c49..1cb0cae 100644 --- a/components-starter/camel-iota-starter/pom.xml +++ b/components-starter/camel-iota-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-iota</artifactId> <version>${camel-version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java index 7341c08..e810f1c 100644 --- a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java +++ b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java @@ -18,6 +18,7 @@ package org.apache.camel.component.reactive.streams.springboot.test.support; import java.util.function.Function; +import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.component.reactive.streams.ReactiveStreamsCamelSubscriber; import org.apache.camel.component.reactive.streams.ReactiveStreamsConsumer; @@ -163,4 +164,9 @@ public class ReactiveStreamsServiceTestSupport implements CamelReactiveStreamsSe public String getId() { return id; } + + @Override + public CamelContext getCamelContext() { + return null; + } } diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 7e5c2da..c5094eb 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -73,7 +73,7 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.68</version> + <version>1.2.72</version> </dependency> <dependency> <groupId>com.cloudbees.thirdparty</groupId>