This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 7c3a324 Remove pulsar-common dependency from pulsar-io-core module
and cleanup pulsar-common dependency references (#2020)
7c3a324 is described below
commit 7c3a3242e0777f07f70c5c2044d4bd799929a78a
Author: Sijie Guo <[email protected]>
AuthorDate: Thu Jun 21 22:34:16 2018 -0700
Remove pulsar-common dependency from pulsar-io-core module and cleanup
pulsar-common dependency references (#2020)
*Motivation*
With pulsar-common shading in pulsar-client, conflicts observed when using
pulsar-client with connectors. Because pulsar-client shades its dependencies,
while pulsar-io implementations pull in pulsar-common which depends on
non-shaded dependencies.
*Changes*
- Move KeyValue class to pulsar-io-core, since all pulsar-io is using it.
- Remove pulsar-common from all pulsar-io implementation modules
- Cleanup all direct usage of pulsar-common when pulsar-client-original is
in the place.
---
pulsar-broker/pom.xml | 12 ------------
pulsar-client-admin/pom.xml | 6 ------
pulsar-client-tools/pom.xml | 5 -----
pulsar-functions/worker/pom.xml | 6 ------
pulsar-io/aerospike/pom.xml | 6 ------
.../apache/pulsar/io/aerospike/AerospikeAbstractSink.java | 2 +-
.../org/apache/pulsar/io/aerospike/AerospikeStringSink.java | 2 +-
pulsar-io/cassandra/pom.xml | 6 ------
.../apache/pulsar/io/cassandra/CassandraAbstractSink.java | 2 +-
.../org/apache/pulsar/io/cassandra/CassandraStringSink.java | 2 +-
pulsar-io/core/pom.xml | 7 +++++++
.../src/main/java/org/apache/pulsar/io/core}/KeyValue.java | 2 +-
pulsar-io/kafka/pom.xml | 6 ------
.../java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java | 2 +-
.../java/org/apache/pulsar/io/kafka/KafkaStringSink.java | 2 +-
pulsar-io/kinesis/pom.xml | 10 +++++++---
pulsar-io/rabbitmq/pom.xml | 6 ------
pulsar-proxy/pom.xml | 6 ------
pulsar-websocket/pom.xml | 6 ------
19 files changed, 21 insertions(+), 75 deletions(-)
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 0306b69..c9b871d 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -68,18 +68,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>circe-checksum</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>pulsar-client-original</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml
index 4ea2814..f4f1fce 100644
--- a/pulsar-client-admin/pom.xml
+++ b/pulsar-client-admin/pom.xml
@@ -42,12 +42,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>pulsar-functions-proto</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/pulsar-client-tools/pom.xml b/pulsar-client-tools/pom.xml
index c83378c..0332426 100644
--- a/pulsar-client-tools/pom.xml
+++ b/pulsar-client-tools/pom.xml
@@ -55,11 +55,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>pulsar-client-original</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/pulsar-functions/worker/pom.xml b/pulsar-functions/worker/pom.xml
index 289edac..5ff2023 100644
--- a/pulsar-functions/worker/pom.xml
+++ b/pulsar-functions/worker/pom.xml
@@ -53,12 +53,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
</dependency>
diff --git a/pulsar-io/aerospike/pom.xml b/pulsar-io/aerospike/pom.xml
index 63aa761..6ae88d3 100644
--- a/pulsar-io/aerospike/pom.xml
+++ b/pulsar-io/aerospike/pom.xml
@@ -39,12 +39,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
diff --git
a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
index 6325eec..15fcc52 100644
---
a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
+++
b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
@@ -31,7 +31,7 @@ import com.aerospike.client.async.NioEventLoops;
import com.aerospike.client.listener.WriteListener;
import com.aerospike.client.policy.ClientPolicy;
import com.aerospike.client.policy.WritePolicy;
-import org.apache.pulsar.common.util.KeyValue;
+import org.apache.pulsar.io.core.KeyValue;
import org.apache.pulsar.io.core.SimpleSink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java
b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java
index affaa84..8bf0174 100644
---
a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java
+++
b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java
@@ -19,7 +19,7 @@
package org.apache.pulsar.io.aerospike;
-import org.apache.pulsar.common.util.KeyValue;
+import org.apache.pulsar.io.core.KeyValue;
/**
* Aerospike sink that treats incoming messages on the input topic as Strings
diff --git a/pulsar-io/cassandra/pom.xml b/pulsar-io/cassandra/pom.xml
index d997f06..1e52e8f 100644
--- a/pulsar-io/cassandra/pom.xml
+++ b/pulsar-io/cassandra/pom.xml
@@ -39,12 +39,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
diff --git
a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java
b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java
index c177f9f..7bdc4ac 100644
---
a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java
+++
b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java
@@ -27,7 +27,7 @@ import com.datastax.driver.core.ResultSetFuture;
import com.datastax.driver.core.Session;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
-import org.apache.pulsar.common.util.KeyValue;
+import org.apache.pulsar.io.core.KeyValue;
import org.apache.pulsar.io.core.SimpleSink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java
b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java
index c4026d2..5c0cb16 100644
---
a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java
+++
b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java
@@ -19,7 +19,7 @@
package org.apache.pulsar.io.cassandra;
-import org.apache.pulsar.common.util.KeyValue;
+import org.apache.pulsar.io.core.KeyValue;
/**
* Cassandra sink that treats incoming messages on the input topic as Strings
diff --git a/pulsar-io/core/pom.xml b/pulsar-io/core/pom.xml
index 4bf1439..77dbb0c 100644
--- a/pulsar-io/core/pom.xml
+++ b/pulsar-io/core/pom.xml
@@ -30,4 +30,11 @@
<artifactId>pulsar-io-core</artifactId>
<name>Pulsar IO :: IO</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
diff --git
a/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyValue.java
b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/KeyValue.java
similarity index 96%
rename from
pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyValue.java
rename to pulsar-io/core/src/main/java/org/apache/pulsar/io/core/KeyValue.java
index 4c7be8e..ed34f04 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyValue.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/KeyValue.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pulsar.common.util;
+package org.apache.pulsar.io.core;
/**
* A simple KeyValue class
diff --git a/pulsar-io/kafka/pom.xml b/pulsar-io/kafka/pom.xml
index f5a5250..976fb77 100644
--- a/pulsar-io/kafka/pom.xml
+++ b/pulsar-io/kafka/pom.xml
@@ -39,12 +39,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
diff --git
a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java
b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java
index ae81693..1d6b8b2 100644
---
a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java
+++
b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java
@@ -23,7 +23,7 @@ import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.pulsar.common.util.KeyValue;
+import org.apache.pulsar.io.core.KeyValue;
import org.apache.pulsar.io.core.SimpleSink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSink.java
b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSink.java
index 6e39817..775b5be 100644
---
a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSink.java
+++
b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSink.java
@@ -19,7 +19,7 @@
package org.apache.pulsar.io.kafka;
-import org.apache.pulsar.common.util.KeyValue;
+import org.apache.pulsar.io.core.KeyValue;
/**
* Kafka sink that treats incoming messages on the input topic as Strings
diff --git a/pulsar-io/kinesis/pom.xml b/pulsar-io/kinesis/pom.xml
index 0dee750..4b825e8 100644
--- a/pulsar-io/kinesis/pom.xml
+++ b/pulsar-io/kinesis/pom.xml
@@ -39,9 +39,13 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
diff --git a/pulsar-io/rabbitmq/pom.xml b/pulsar-io/rabbitmq/pom.xml
index ff7111f..46f7826 100644
--- a/pulsar-io/rabbitmq/pom.xml
+++ b/pulsar-io/rabbitmq/pom.xml
@@ -39,12 +39,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml
index dd260c6..50ebd2f 100644
--- a/pulsar-proxy/pom.xml
+++ b/pulsar-proxy/pom.xml
@@ -33,12 +33,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>pulsar-client-original</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/pulsar-websocket/pom.xml b/pulsar-websocket/pom.xml
index bb25673..e139022 100644
--- a/pulsar-websocket/pom.xml
+++ b/pulsar-websocket/pom.xml
@@ -41,12 +41,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>pulsar-client-original</artifactId>
<version>${project.version}</version>
</dependency>
