Author: davsclaus
Date: Tue Nov 27 08:23:46 2012
New Revision: 1414016
URL: http://svn.apache.org/viewvc?rev=1414016&view=rev
Log:
Upgraded to avro 1.7.2
Modified:
camel/trunk/components/camel-avro/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-avro/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/pom.xml?rev=1414016&r1=1414015&r2=1414016&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/pom.xml (original)
+++ camel/trunk/components/camel-avro/pom.xml Tue Nov 27 08:23:46 2012
@@ -66,10 +66,52 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- use Netty version as Camel -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty-version}</version>
+ </dependency>
+ <!-- use Jackson version as Camel -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1414016&r1=1414015&r2=1414016&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Nov 27 08:23:46 2012
@@ -53,8 +53,8 @@
<aspectj-version>1.6.2</aspectj-version>
<atomikos-transactions-version>3.8.0</atomikos-transactions-version>
<avalon-bundle-version>4.3.1_1</avalon-bundle-version>
- <avro-version>1.6.2</avro-version>
- <avro-bundle-version>1.6.1_1</avro-bundle-version>
+ <avro-version>1.7.2</avro-version>
+ <avro-bundle-version>1.7.1_1</avro-bundle-version>
<aws-java-sdk-bundle-version>1.3.14_1</aws-java-sdk-bundle-version>
<aws-java-sdk-version>1.3.25</aws-java-sdk-version>
<axiom-version>1.2.12</axiom-version>
@@ -246,8 +246,6 @@
<mvel-version>2.0.18</mvel-version>
<mybatis-version>3.1.1</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
- <!-- transitive dependency from avro, to use older netty bundle -->
- <netty-bundle-version>3.2.7.Final_1</netty-bundle-version>
<netty-version>3.5.10.Final</netty-version>
<ode-version>1.3.4</ode-version>
<!-- should be in-sync with deltaspike -->
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1414016&r1=1414015&r2=1414016&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Nov 27 08:23:46 2012
@@ -215,8 +215,8 @@
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle
dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty/${netty-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snappy-java/${snappy-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}</bundle>
