This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.25.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4b2c4807b0a962401f078b9f717face5a8dfd34b Author: Claus Ibsen <[email protected]> AuthorDate: Sat Dec 19 10:29:50 2020 +0100 CAMEL-15976: upgrade camel-corda to 4.6. CAMEL-15977: upgrade netty to 4.1.56 --- docs/components/modules/ROOT/pages/http4-component.adoc | 6 ------ docs/components/modules/ROOT/pages/mongodb-component.adoc | 2 +- parent/pom.xml | 4 ++-- platforms/karaf/features/src/main/resources/features.xml | 8 +++++++- .../spring-boot/components-starter/camel-corda-starter/pom.xml | 4 ---- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/docs/components/modules/ROOT/pages/http4-component.adoc b/docs/components/modules/ROOT/pages/http4-component.adoc index 78fd086..56f540e 100644 --- a/docs/components/modules/ROOT/pages/http4-component.adoc +++ b/docs/components/modules/ROOT/pages/http4-component.adoc @@ -38,12 +38,6 @@ http4:hostname[:port][/resourceUri][?options] Will by default use port 80 for HTTP and 443 for HTTPS. -In the case of calling an HTTPS endpoint, you can use the following: -[source,java] ---------------------------------------------- -https4:hostname[:port][/resourceUri][?options] ---------------------------------------------- - You can append query options to the URI in the following format, `?option=value&option=value&...` diff --git a/docs/components/modules/ROOT/pages/mongodb-component.adoc b/docs/components/modules/ROOT/pages/mongodb-component.adoc index 85e3e24..a165c7a 100644 --- a/docs/components/modules/ROOT/pages/mongodb-component.adoc +++ b/docs/components/modules/ROOT/pages/mongodb-component.adoc @@ -157,7 +157,7 @@ MongoDB instance. <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="mongoBean" class="com.mongodb.MongoClient"> + <bean id="mongoBean" class="com.mongodb.Mongo"> <constructor-arg name="host" value="${mongodb.host}" /> <constructor-arg name="port" value="${mongodb.port}" /> </bean> diff --git a/parent/pom.xml b/parent/pom.xml index 1fe3239..2fd67da 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -164,7 +164,7 @@ <consul-client-version>1.3.3</consul-client-version> <consul-client-bundle-version>1.3.3_1</consul-client-bundle-version> <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version> - <corda-version>3.3-corda</corda-version> + <corda-version>4.6</corda-version> <couchbase-client-version>1.4.13</couchbase-client-version> <couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version> <curator-version>2.12.0</curator-version> @@ -527,7 +527,7 @@ <nekohtml-version>1.9.22</nekohtml-version> <neoscada-version>0.4.0</neoscada-version> <netty3-version>3.10.6.Final</netty3-version> - <netty-version>4.1.48.Final</netty-version> + <netty-version>4.1.56.Final</netty-version> <netty40-version>4.0.56.Final</netty40-version> <networknt-json-schema-validator-version>0.1.25</networknt-json-schema-validator-version> <noggit-bundle-version>0.5_1</noggit-bundle-version> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 9308441..96f1d12 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -642,7 +642,6 @@ <bundle>mvn:org.apache.camel/camel-elasticsearch5/${project.version}</bundle> </feature> <feature name='camel-elasticsearch-rest' version='${project.version}' resolver='(obr)' start-level='50'> - <details>camel-elasticsearch-rest currently does not work in OSGi</details> <feature version='${project.version}'>camel-core</feature> <feature>http</feature> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> @@ -1777,6 +1776,13 @@ <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml/aalto-xml/0.9.10</bundle> + <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle> <bundle dependency='true'>mvn:org.apache.camel/camel-olingo4-api/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-olingo4/${project.version}</bundle> </feature> diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml b/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml index 51dddcf..cea4353 100644 --- a/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml @@ -41,10 +41,6 @@ <!--START OF GENERATED CODE--> <exclusions> <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> </exclusion> diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index e60890d..c9a45c5 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -189,7 +189,7 @@ <dependency> <groupId>net.corda</groupId> <artifactId>corda-rpc</artifactId> - <version>3.3-corda</version> + <version>4.6</version> <exclusions> <exclusion> <groupId>co.paralleluniverse</groupId>
