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.git
commit e2b214022085fc4d227ef909e1fe1188255b82e1
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri May 17 09:58:20 2019 +0200
CAMEL-13538 - Camel-Avro: Upgrade to 1.9.0
---
components/camel-avro/pom.xml | 46 +++-------------------
.../camel/component/avro/AvroConfiguration.java | 2 +-
.../apache/camel/component/avro/AvroListener.java | 10 ++---
.../camel/component/avro/AvroNettyProducer.java | 2 +-
.../apache/camel/component/avro/AvroProducer.java | 3 +-
.../camel/component/avro/AvroHttpProducerTest.java | 2 +-
.../component/avro/AvroNettyConsumerTest.java | 2 +-
.../component/avro/AvroNettyProducerTest.java | 2 +-
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 20 +++++-----
.../camel/itest/springboot/CamelAvroTest.java | 4 ++
11 files changed, 32 insertions(+), 63 deletions(-)
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 20ee0a5..98bb1eb 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -68,52 +68,16 @@
<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>
+ <artifactId>avro-ipc-netty</artifactId>
+ <version>${avro-version}</version>
</dependency>
-
- <!-- use Netty version as Camel -->
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty3-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>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-ipc-jetty</artifactId>
+ <version>${avro-version}</version>
</dependency>
<!-- testing -->
diff --git
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
index 85d940c..c68a5f5 100644
---
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
+++
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import static
org.apache.camel.component.avro.AvroConstants.AVRO_MESSAGE_NAME_SEPARATOR;
diff --git
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
index e3c5563..d259c58 100644
---
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
+++
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
@@ -22,15 +22,15 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.avro.Protocol;
import org.apache.avro.Schema;
-import org.apache.avro.ipc.HttpServer;
-import org.apache.avro.ipc.NettyServer;
import org.apache.avro.ipc.Server;
+import org.apache.avro.ipc.jetty.HttpServer;
+import org.apache.avro.ipc.netty.NettyServer;
import org.apache.avro.ipc.specific.SpecificResponder;
import org.apache.avro.specific.SpecificData;
import org.apache.camel.Exchange;
import org.apache.camel.support.ExchangeHelper;
-import org.apache.commons.lang.StringUtils;
-import org.mortbay.log.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jetty.util.log.Log;
import static
org.apache.camel.component.avro.AvroConstants.AVRO_HTTP_TRANSPORT;
import static
org.apache.camel.component.avro.AvroConstants.AVRO_NETTY_TRANSPORT;
@@ -113,7 +113,7 @@ public class AvroListener {
public boolean unregister(String messageName) {
if (!StringUtils.isEmpty(messageName)) {
if (consumerRegistry.remove(messageName) == null) {
- Log.warn("Consumer with message name {} was already
unregistered.", messageName);
+ Log.getLog().warn("Consumer with message name {} was already
unregistered.", messageName);
}
} else {
defaultConsumer = null;
diff --git
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java
index 71d069f..eecf1e3 100644
---
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java
+++
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroNettyProducer.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.avro;
import java.net.InetSocketAddress;
-import org.apache.avro.ipc.NettyTransceiver;
import org.apache.avro.ipc.Transceiver;
+import org.apache.avro.ipc.netty.NettyTransceiver;
import org.apache.camel.Endpoint;
public class AvroNettyProducer extends AvroProducer {
diff --git
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
index eccfcb2..d062f1d 100644
---
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
+++
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
@@ -23,7 +23,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultAsyncProducer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+
public abstract class AvroProducer extends DefaultAsyncProducer {
diff --git
a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
index a632ab3..d92f11c 100644
---
a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
+++
b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.avro;
import java.io.IOException;
-import org.apache.avro.ipc.HttpServer;
+import org.apache.avro.ipc.jetty.HttpServer;
import org.apache.avro.ipc.reflect.ReflectResponder;
import org.apache.avro.ipc.specific.SpecificResponder;
import org.apache.camel.avro.generated.KeyValueProtocol;
diff --git
a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
index 698b6a1..96c4af4 100644
---
a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
+++
b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.avro;
import java.io.IOException;
import java.net.InetSocketAddress;
-import org.apache.avro.ipc.NettyTransceiver;
+import org.apache.avro.ipc.netty.NettyTransceiver;
import org.apache.avro.ipc.reflect.ReflectRequestor;
import org.apache.avro.ipc.specific.SpecificRequestor;
import org.apache.camel.avro.generated.KeyValueProtocol;
diff --git
a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
index b0a2ab6..30e8176 100644
---
a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
+++
b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.avro;
import java.net.InetSocketAddress;
-import org.apache.avro.ipc.NettyServer;
+import org.apache.avro.ipc.netty.NettyServer;
import org.apache.avro.ipc.reflect.ReflectResponder;
import org.apache.avro.ipc.specific.SpecificResponder;
import org.apache.camel.avro.generated.KeyValueProtocol;
diff --git a/parent/pom.xml b/parent/pom.xml
index e2e3c04..cd983b0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -79,7 +79,7 @@
<automaton-bundle-version>1.11-8_1</automaton-bundle-version>
<avalon-bundle-version>4.3.1_1</avalon-bundle-version>
<avalon-version>4.3.1</avalon-version>
- <avro-version>1.8.2</avro-version>
+ <avro-version>1.9.0</avro-version>
<avro-bundle-version>1.8.2_1</avro-bundle-version>
<avro-ipc-bundle-version>1.8.2_1</avro-ipc-bundle-version>
<awaitility-version>3.1.6</awaitility-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 76cf00d..fd47264 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -228,18 +228,18 @@
<bundle>mvn:org.apache.camel/camel-atomix/${project.version}</bundle>
</feature>
<feature name='camel-avro' version='${project.version}' start-level='50'>
- <details>The camel-avro feature can only run if you have
libsnappyjava.dylib in java.library.path</details>
<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/${netty3-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-ipc-bundle-version}</bundle>
+ <feature version="[9,10)">jetty</feature>
+ <bundle dependency='true'>mvn:org.apache.avro/avro/${avro-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.avro/avro-ipc-jetty/${avro-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.avro/avro-ipc-netty/${avro-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:commons-lang/commons-lang/${commons-lang-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.xerial.snappy/snappy-java/${snappy-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>mvn:org.apache.camel/camel-avro/${project.version}</bundle>
</feature>
<feature name='camel-aws' version='${project.version}' start-level='50'>
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
index ef9b06b..5586d39 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
@@ -35,6 +35,10 @@ public class CamelAvroTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelAvroTest.class))
+ .dependency("org.apache.avro:avro:1.9.0")
+ .dependency("org.apache.avro:avro-ipc:1.9.0")
+ .dependency("org.apache.avro:avro-ipc-jetty:1.9.0")
+ .dependency("org.apache.avro:avro-ipc-netty:1.9.0")
.build();
}
