This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 9aa3d09 CAMEL-15879 Update avro version to 1.10.x (1.10.0) (#55)
9aa3d09 is described below
commit 9aa3d09f7b70ef6ce6f9fbab303b5c5ddd771371
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Mon Nov 30 20:29:27 2020 +0100
CAMEL-15879 Update avro version to 1.10.x (1.10.0) (#55)
---
platforms/karaf/features/src/main/resources/features.xml | 11 ++---------
pom.xml | 2 +-
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 7e85195..a5997e1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -243,19 +243,12 @@
</feature>
<feature name='camel-avro' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature>jetty</feature>
- <bundle dependency='true'>mvn:org.apache.avro/avro/${avro-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.avro/avro-ipc-jetty/${avro-ipc-jetty-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.avro/avro-ipc-netty/${avro-ipc-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-annotations/${jackson2-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
- <bundle
dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.commons/commons-compress/${avro-java-commons-compress-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.avro/avro/${avro-version}</bundle>
<bundle>mvn:org.apache.camel/camel-avro/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-avro-rpc/${project.version}</bundle>
</feature>
<feature name='camel-aws' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-aws-cw</feature>
diff --git a/pom.xml b/pom.xml
index 939964a..c018224 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
<asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version>
<automaton-bundle-version>1.11-8_1</automaton-bundle-version>
<avalon-bundle-version>4.3.1_1</avalon-bundle-version>
- <avro-bundle-version>1.9.1_1</avro-bundle-version>
+
<avro-java-commons-compress-version>1.20</avro-java-commons-compress-version>
<aws-java-sdk-bundle-version>1.11.714_1</aws-java-sdk-bundle-version>
<azure-core-bundle-version>1.4.0_1</azure-core-bundle-version>
<azure-core-amqp-bundle-version>1.4.0_1</azure-core-amqp-bundle-version>
