This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.20.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.20.x by this push: new eddd9e8 CAMEL-12404 - Upgrade Jackson-databind to version 2.8.11.1 eddd9e8 is described below commit eddd9e83c8f0431602c93e93700979d6af04f4e9 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed May 23 10:38:01 2018 +0200 CAMEL-12404 - Upgrade Jackson-databind to version 2.8.11.1 --- components/camel-elasticsearch/pom.xml | 2 +- components/camel-elasticsearch5/pom.xml | 2 +- .../camel-ftp/src/main/docs/ftp-component.adoc | 2 +- .../camel-ftp/src/main/docs/ftps-component.adoc | 2 +- .../camel-ftp/src/main/docs/sftp-component.adoc | 2 +- .../camel-servicenow-component/pom.xml | 2 +- components/camel-telegram/pom.xml | 2 +- components/readme.adoc | 14 +--- connectors/camel-connector-maven-plugin/pom.xml | 2 +- docs/user-manual/en/SUMMARY.md | 4 -- parent/pom.xml | 3 +- platforms/camel-catalog-connector/pom.xml | 2 +- platforms/camel-catalog-rest/pom.xml | 2 +- .../karaf/features/src/main/resources/features.xml | 84 +++++++++++----------- .../src/main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 4 +- 16 files changed, 57 insertions(+), 74 deletions(-) diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml index 00f06b6..65f2bec 100644 --- a/components/camel-elasticsearch/pom.xml +++ b/components/camel-elasticsearch/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-elasticsearch5/pom.xml b/components/camel-elasticsearch5/pom.xml index 1d0ada7..8f255b4 100644 --- a/components/camel-elasticsearch5/pom.xml +++ b/components/camel-elasticsearch5/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> </dependency> <!-- for testing --> diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc index c015bbb..a2814d6 100644 --- a/components/camel-ftp/src/main/docs/ftp-component.adoc +++ b/components/camel-ftp/src/main/docs/ftp-component.adoc @@ -160,7 +160,7 @@ with the following path and query parameters: | *throwExceptionOnConnect Failed* (advanced) | Should an exception be thrown if connection failed (exhausted) By default exception is not thrown and a WARN is logged. You can use this to enable exception being thrown and handle the thrown exception from the org.apache.camel.spi.PollingConsumerPollStrategy rollback method. | false | boolean | *timeout* (advanced) | Sets the data timeout for waiting for reply Used only by FTPClient | 30000 | int | *antExclude* (filter) | Ant style filter exclusion. If both antInclude and antExclude are used antExclude takes precedence over antInclude. Multiple exclusions may be specified in comma-delimited format. | | String -| *antFilterCaseSensitive* (filter) | Sets case sensitive flag on ant filter | true | boolean +| *antFilterCaseSensitive* (filter) | Sets case sensitive flag on ant fiter | true | boolean | *antInclude* (filter) | Ant style filter inclusion. Multiple inclusions may be specified in comma-delimited format. | | String | *eagerMaxMessagesPerPoll* (filter) | Allows for controlling whether the limit from maxMessagesPerPoll is eager or not. If eager then the limit is during the scanning of files. Where as false would scan all files and then perform sorting. Setting this option to false allows for sorting all files first and then limit the poll. Mind that this requires a higher memory usage as all file details are in memory to perform the sorting. | true | boolean | *exclude* (filter) | Is used to exclude files if filename matches the regex pattern (matching is case in-senstive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris | | String diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc index a3d42eb..69415f7 100644 --- a/components/camel-ftp/src/main/docs/ftps-component.adoc +++ b/components/camel-ftp/src/main/docs/ftps-component.adoc @@ -120,7 +120,7 @@ with the following path and query parameters: | *throwExceptionOnConnect Failed* (advanced) | Should an exception be thrown if connection failed (exhausted) By default exception is not thrown and a WARN is logged. You can use this to enable exception being thrown and handle the thrown exception from the org.apache.camel.spi.PollingConsumerPollStrategy rollback method. | false | boolean | *timeout* (advanced) | Sets the data timeout for waiting for reply Used only by FTPClient | 30000 | int | *antExclude* (filter) | Ant style filter exclusion. If both antInclude and antExclude are used antExclude takes precedence over antInclude. Multiple exclusions may be specified in comma-delimited format. | | String -| *antFilterCaseSensitive* (filter) | Sets case sensitive flag on ant filter | true | boolean +| *antFilterCaseSensitive* (filter) | Sets case sensitive flag on ant fiter | true | boolean | *antInclude* (filter) | Ant style filter inclusion. Multiple inclusions may be specified in comma-delimited format. | | String | *eagerMaxMessagesPerPoll* (filter) | Allows for controlling whether the limit from maxMessagesPerPoll is eager or not. If eager then the limit is during the scanning of files. Where as false would scan all files and then perform sorting. Setting this option to false allows for sorting all files first and then limit the poll. Mind that this requires a higher memory usage as all file details are in memory to perform the sorting. | true | boolean | *exclude* (filter) | Is used to exclude files if filename matches the regex pattern (matching is case in-senstive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris | | String diff --git a/components/camel-ftp/src/main/docs/sftp-component.adoc b/components/camel-ftp/src/main/docs/sftp-component.adoc index 4e1598a..8a43ce8 100644 --- a/components/camel-ftp/src/main/docs/sftp-component.adoc +++ b/components/camel-ftp/src/main/docs/sftp-component.adoc @@ -106,7 +106,7 @@ with the following path and query parameters: | *throwExceptionOnConnect Failed* (advanced) | Should an exception be thrown if connection failed (exhausted) By default exception is not thrown and a WARN is logged. You can use this to enable exception being thrown and handle the thrown exception from the org.apache.camel.spi.PollingConsumerPollStrategy rollback method. | false | boolean | *timeout* (advanced) | Sets the data timeout for waiting for reply Used only by FTPClient | 30000 | int | *antExclude* (filter) | Ant style filter exclusion. If both antInclude and antExclude are used antExclude takes precedence over antInclude. Multiple exclusions may be specified in comma-delimited format. | | String -| *antFilterCaseSensitive* (filter) | Sets case sensitive flag on ant filter | true | boolean +| *antFilterCaseSensitive* (filter) | Sets case sensitive flag on ant fiter | true | boolean | *antInclude* (filter) | Ant style filter inclusion. Multiple inclusions may be specified in comma-delimited format. | | String | *eagerMaxMessagesPerPoll* (filter) | Allows for controlling whether the limit from maxMessagesPerPoll is eager or not. If eager then the limit is during the scanning of files. Where as false would scan all files and then perform sorting. Setting this option to false allows for sorting all files first and then limit the poll. Mind that this requires a higher memory usage as all file details are in memory to perform the sorting. | true | boolean | *exclude* (filter) | Is used to exclude files if filename matches the regex pattern (matching is case in-senstive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris | | String diff --git a/components/camel-servicenow/camel-servicenow-component/pom.xml b/components/camel-servicenow/camel-servicenow-component/pom.xml index 16d1043..76d5de4 100644 --- a/components/camel-servicenow/camel-servicenow-component/pom.xml +++ b/components/camel-servicenow/camel-servicenow-component/pom.xml @@ -84,7 +84,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml index fba1716..4a5e9f1 100644 --- a/components/camel-telegram/pom.xml +++ b/components/camel-telegram/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> </dependency> <dependency> diff --git a/components/readme.adoc b/components/readme.adoc index ce14df8..14a6540 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^^^^^^^^^ // components: START -Number of Components: 286 in 197 JAR artifacts (17 deprecated) +Number of Components: 284 in 195 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -227,9 +227,6 @@ Number of Components: 286 in 197 JAR artifacts (17 deprecated) | link:camel-ejb/src/main/docs/ejb-component.adoc[EJB] (camel-ejb) + `ejb:beanName` | 2.4 | The ejb component is for invoking EJB Java beans from Camel. -| link:camel-elasticsearch5-rest/src/main/docs/elasticsearch5-rest-component.adoc[Elastichsearch5 Rest] (camel-elasticsearch5-rest) + -`elasticsearch5-rest:clusterName` | 2.21 | The elasticsearch component is used for interfacing with ElasticSearch server using 5.x REST API. - | link:camel-elasticsearch/src/main/docs/elasticsearch-component.adoc[Elasticsearch] (camel-elasticsearch) + `elasticsearch:clusterName` | 2.11 | The elasticsearch component is used for interfacing with ElasticSearch server. @@ -851,9 +848,6 @@ Number of Components: 286 in 197 JAR artifacts (17 deprecated) | link:../camel-core/src/main/docs/xslt-component.adoc[XSLT] (camel-core) + `xslt:resourceUri` | 1.3 | Transforms the message using a XSLT template. -| link:camel-yql/src/main/docs/yql-component.adoc[Yahoo Query Language] (camel-yql) + -`yql:query` | 2.21 | The YQL (Yahoo! Query Language) platform enables you to query filter and combine data across the web. - | link:camel-yammer/src/main/docs/yammer-component.adoc[Yammer] (camel-yammer) + `yammer:function` | 2.12 | The yammer component allows you to interact with the Yammer enterprise social network. @@ -1044,7 +1038,7 @@ Miscellaneous Components ^^^^^^^^^^^^^^^^^^^^^^^^ // others: START -Number of Miscellaneous Components: 39 in 39 JAR artifacts (13 deprecated) +Number of Miscellaneous Components: 37 in 37 JAR artifacts (13 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -1076,8 +1070,6 @@ Number of Miscellaneous Components: 39 in 39 JAR artifacts (13 deprecated) | link:camel-leveldb/src/main/docs/leveldb.adoc[LevelDB] (camel-leveldb) | 2.10 | Using LevelDB as persistent EIP store -| link:camel-lra/src/main/docs/lra.adoc[Lra] (camel-lra) | 2.21 | Camel saga binding for Long-Running-Action framework - | link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing | link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component @@ -1124,8 +1116,6 @@ Number of Miscellaneous Components: 39 in 39 JAR artifacts (13 deprecated) | link:camel-urlrewrite/src/main/docs/urlrewrite.adoc[URLRewrite] (camel-urlrewrite) | 2.11 | *deprecated* URL rewrite support for HTTP components -| link:camel-aws-xray/src/main/docs/aws-xray.adoc[XRay] (camel-aws-xray) | 2.21 | Distributed tracing using AWS XRay - | link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18 | Distributed message tracing using Zipkin |=== // others: END diff --git a/connectors/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml index 29e9f41..f0b1a3c 100644 --- a/connectors/camel-connector-maven-plugin/pom.xml +++ b/connectors/camel-connector-maven-plugin/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> </dependency> <!-- roaster to create java source for Spring Boot auto configuration support --> diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 84831f9..332940e 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -188,7 +188,6 @@ * [EHCache](cache-component.adoc) * [Ehcache](ehcache-component.adoc) * [EJB](ejb-component.adoc) - * [Elastichsearch5 Rest](elasticsearch5-rest-component.adoc) * [Elasticsearch](elasticsearch-component.adoc) * [Elasticsearch5](elasticsearch5-component.adoc) * [ElSQL](elsql-component.adoc) @@ -380,7 +379,6 @@ * [XML Security](xmlsecurity-component.adoc) * [XMPP](xmpp-component.adoc) * [XQuery](xquery-component.adoc) - * [Yahoo Query Language](yql-component.adoc) * [Yammer](yammer-component.adoc) * [Zendesk](zendesk-component.adoc) * [ZooKeeper](zookeeper-component.adoc) @@ -405,7 +403,6 @@ * [Jasypt](jasypt.adoc) * [Kura](kura.adoc) * [LevelDB](leveldb.adoc) - * [Lra](lra.adoc) * [OpenTracing](opentracing.adoc) * [Reactor](reactor.adoc) * [Ribbon](ribbon.adoc) @@ -429,7 +426,6 @@ * [Test Spring](test-spring.adoc) * [TestNG](testng.adoc) * [URLRewrite](urlrewrite.adoc) - * [XRay](aws-xray.adoc) * [Zipkin](zipkin.adoc) <!-- others: END --> diff --git a/parent/pom.xml b/parent/pom.xml index ef46d8f..418d748 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -328,6 +328,7 @@ <jackson2-scala-version>2.6.1</jackson2-scala-version> <!-- jackson 2.9.x is not yet working with all camel components such as swagger-java --> <jackson2-version>2.8.10</jackson2-version> + <jackson2-databind-version>2.8.11.1</jackson2-databind-version> <jackrabbit-version>2.15.6</jackrabbit-version> <jackrabbit-guava-version>15.0</jackrabbit-guava-version> <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version> @@ -3609,7 +3610,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> diff --git a/platforms/camel-catalog-connector/pom.xml b/platforms/camel-catalog-connector/pom.xml index 75f30f8..f31beee 100644 --- a/platforms/camel-catalog-connector/pom.xml +++ b/platforms/camel-catalog-connector/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/platforms/camel-catalog-rest/pom.xml b/platforms/camel-catalog-rest/pom.xml index 443c494..d1e6f93 100644 --- a/platforms/camel-catalog-rest/pom.xml +++ b/platforms/camel-catalog-rest/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> + <version>${jackson2-databind-version}</version> </dependency> <!-- REST api --> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 596b531..e613e9c 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -176,7 +176,7 @@ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/${jackson2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aws-java-sdk/${aws-java-sdk-bundle-version}</bundle> @@ -253,7 +253,7 @@ <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.htmlunit/${htmlunit-bundle-version}</bundle> @@ -307,7 +307,7 @@ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cassandra-metrics-version}</bundle> <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${cassandra-metrics-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.datastax.cassandra/cassandra-driver-core/${cassandra-driver-version}</bundle> <bundle>mvn:org.apache.camel/camel-cassandraql/${project.version}</bundle> @@ -399,7 +399,7 @@ <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle> @@ -487,7 +487,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.docker-java/${docker-java-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.2_spec/${geronimo-annotation-1.2-spec-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle> @@ -564,7 +564,7 @@ <bundle dependency='true'>mvn:com.google.guava/guava/${elasticsearch-guava-version}</bundle> <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> @@ -585,7 +585,7 @@ <feature>http</feature> <bundle dependency='true'>mvn:com.google.guava/guava/${elasticsearch-guava-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> @@ -602,7 +602,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib-bundle-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-afterburner/${jackson2-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle> @@ -930,7 +930,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-hipchat/${project.version}</bundle> </feature> @@ -1064,7 +1064,7 @@ <feature name='camel-jackson' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-jackson/${project.version}</bundle> @@ -1072,7 +1072,7 @@ <feature name='camel-jacksonxml' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> @@ -1227,15 +1227,11 @@ </feature> <feature name='camel-json-validator' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:com.github.everit-org.json-schema/org.everit.json.schema/${everit-org-json-schema-version}</bundle> - <bundle dependency='true'>mvn:org.json/json/20170516</bundle> - <bundle dependency='true'>mvn:com.damnhandy/handy-uri-templates/2.1.6</bundle> - <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.google.guava/guava/22.0</bundle> - <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> - <bundle dependency='true'>mvn:commons-validator/commons-validator/1.6</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle> - <bundle dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.networknt/json-schema-validator/${networknt-json-schema-validator-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle>mvn:org.apache.camel/camel-json-validator/${project.version}</bundle> </feature> <feature name='camel-jsonpath' version='${project.version}' resolver='(obr)' start-level='50'> @@ -1244,7 +1240,7 @@ <bundle>mvn:net.minidev/json-smart-action/${json-smart-karaf-version}</bundle> <bundle>mvn:net.minidev/accessors-smart/${json-accessors-smart-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-jsonpath/${project.version}</bundle> </feature> @@ -1295,7 +1291,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.generex/${generex-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/${automaton-bundle-version}</bundle> @@ -1357,7 +1353,7 @@ <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.htmlunit/${htmlunit-bundle-version}</bundle> <bundle dependency='true'>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.18</bundle> @@ -1406,7 +1402,7 @@ <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-lumberjack/${project.version}</bundle> </feature> @@ -1429,7 +1425,7 @@ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle> <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-metrics/${project.version}</bundle> </feature> @@ -1603,7 +1599,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> @@ -1646,7 +1642,7 @@ <feature name='camel-openstack' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${openstack4j-guava-version}</bundle> <bundle dependency='true'>mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}</bundle> @@ -1772,16 +1768,16 @@ <feature version='${project.version}'>camel-restlet</feature> <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${restlet-woodstox-version}</bundle> - <bundle dependency='true'>mvn:org.yaml/snakeyaml/${restlet-yaml-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-csv/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${restlet-jackson-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${restlet-jackson-version}</bundle> + <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-csv/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson2-version}</bundle> <bundle>mvn:http://maven.restlet.org@id=restlet!org.restlet.osgi/org.restlet.ext.jackson/${restlet-version}</bundle> </feature> <feature name='camel-restlet-gson' version='${project.version}' resolver='(obr)' start-level='50'> @@ -1821,7 +1817,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson2-version}</bundle> <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle> @@ -1878,7 +1874,7 @@ <feature version='${cxf-version-range}'>cxf-jaxrs</feature> <feature version='${cxf-version-range}'>cxf-rs-security-oauth2</feature> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2-version}</bundle> @@ -2119,7 +2115,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> @@ -2158,7 +2154,7 @@ <feature version='${cxf-version-range}'>cxf-core</feature> <feature version='${cxf-version-range}'>cxf-jaxrs</feature> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle> @@ -2204,7 +2200,7 @@ <bundle dependency='true'>wrap:mvn:com.twilio.sdk/twilio/${twilio-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-twilio/${project.version}</bundle> </feature> @@ -2362,7 +2358,7 @@ <bundle dependency='true'>mvn:com.ning/async-http-client/1.9.40</bundle> <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-zendesk/${project.version}</bundle> </feature> @@ -2399,7 +2395,7 @@ <bundle dependency='true'>mvn:org.apache.curator/curator-recipes/${curator-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${zookeeper-guava-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-ersion}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-zookeeper-master/${project.version}</bundle> </feature> diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json index a830729..799bf5f 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType":"org.myfoo.connector.MyFooComponent", "groupId":"org.apache.camel", "artifactId":"myfoo-connector", - "version":"2.20.2-SNAPSHOT" + "version":"2.20.3-SNAPSHOT" }, "componentProperties":{ diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json b/platforms/myfoo-connector/src/main/resources/camel-connector.json index c9443a8..56902fa 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json @@ -2,14 +2,14 @@ "baseScheme" : "timer", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.2-SNAPSHOT", + "baseVersion" : "2.20.3-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", "name" : "MyFoo", "scheme" : "my-foo", "javaType" : "org.myfoo.connector.MyFooComponent", "groupId" : "org.myfoo", "artifactId" : "myfoo-connector", - "version" : "2.20.2-SNAPSHOT", + "version" : "2.20.3-SNAPSHOT", "description" : "Something cool", "labels" : [ "foo", "timer" ], "pattern" : "From", -- To stop receiving notification emails like this one, please contact acosent...@apache.org.