sijie closed pull request #1816: Removed internal shading
URL: https://github.com/apache/incubator-pulsar/pull/1816
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/all/pom.xml b/all/pom.xml
index 7ac9f54c2a..0a9d289fde 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -73,12 +73,12 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
@@ -88,7 +88,7 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
@@ -114,6 +114,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-functions-worker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- runtime-all -->
<dependency>
<groupId>org.apache.pulsar</groupId>
diff --git a/all/src/assemble/bin.xml b/all/src/assemble/bin.xml
index 3c58be7425..e74b68405b 100644
--- a/all/src/assemble/bin.xml
+++ b/all/src/assemble/bin.xml
@@ -111,9 +111,6 @@
<!-- Already included in pulsar-zookeeper instrumented jar -->
<exclude>org.apache.zookeeper:zookeeper</exclude>
- <!-- Already shaded in runtime-shaded jar -->
- <exclude>io.grpc:*</exclude>
-
<!-- Explicitely remove JUnit which is getting pulled in even
though it's set to the scope 'test' -->
<exclude>junit:junit</exclude>
diff --git a/bin/pulsar b/bin/pulsar
index 4a58d30744..e096d27cbd 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -251,6 +251,8 @@ OPTS="$OPTS
-Dpulsar.functions.process.container.log.dir=$PULSAR_LOG_DIR"
OPTS="$OPTS -Dpulsar.functions.java.instance.jar=${JAVA_INSTANCE_JAR}"
OPTS="$OPTS -Dpulsar.functions.python.instance.file=${PY_INSTANCE_FILE}"
+ZK_OPTS=" -Dzookeeper.4lw.commands.whitelist=*"
+
#Change to PULSAR_HOME to support relative paths
cd "$PULSAR_HOME"
if [ $COMMAND == "broker" ]; then
@@ -261,16 +263,16 @@ elif [ $COMMAND == "bookie" ]; then
exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.bookkeeper.proto.BookieServer --conf $PULSAR_BOOKKEEPER_CONF $@
elif [ $COMMAND == "zookeeper" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"zookeeper.log"}
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.zookeeper.ZooKeeperStarter $PULSAR_ZK_CONF $@
+ exec $JAVA ${ZK_OPTS} $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.zookeeper.ZooKeeperStarter $PULSAR_ZK_CONF $@
elif [ $COMMAND == "global-zookeeper" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"global-zookeeper.log"}
# Allow global ZK to turn into read-only mode when it cannot reach the
quorum
- OPTS="${OPTS} -Dreadonlymode.enabled=true"
+ OPTS="${OPTS} ${ZK_OPTS} -Dreadonlymode.enabled=true"
exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.zookeeper.ConfigurationStoreStarter $PULSAR_GLOBAL_ZK_CONF $@
elif [ $COMMAND == "configuration-store" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"configuration-store.log"}
# Allow global ZK to turn into read-only mode when it cannot reach the
quorum
- OPTS="${OPTS} -Dreadonlymode.enabled=true"
+ OPTS="${OPTS} ${ZK_OPTS} -Dreadonlymode.enabled=true"
exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.zookeeper.ConfigurationStoreStarter
$PULSAR_CONFIGURATION_STORE_CONF $@
elif [ $COMMAND == "discovery" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"discovery.log"}
@@ -286,7 +288,7 @@ elif [ $COMMAND == "functions-worker" ]; then
exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.functions.worker.FunctionWorkerStarter -c $PULSAR_WORKER_CONF
$@
elif [ $COMMAND == "standalone" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-standalone.log"}
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.PulsarStandaloneStarter --config $PULSAR_STANDALONE_CONF $@
+ exec $JAVA $OPTS ${ZK_OPTS} -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.PulsarStandaloneStarter --config $PULSAR_STANDALONE_CONF $@
elif [ $COMMAND == "initialize-cluster-metadata" ]; then
exec $JAVA $OPTS org.apache.pulsar.PulsarClusterMetadataSetup $@
elif [ $COMMAND == "zookeeper-shell" ]; then
diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml
index 7b0f7014cb..9ee8570614 100644
--- a/managed-ledger/pom.xml
+++ b/managed-ledger/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server-shaded</artifactId>
+ <artifactId>bookkeeper-server</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4c8bebf7de..6bca2a7ba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,6 @@ flexible messaging model and an intuitive client
API.</description>
<module>pulsar-client-shaded</module>
<module>pulsar-client-admin</module>
<module>pulsar-client-admin-shaded</module>
- <module>pulsar-client-admin-shaded-for-functions</module>
<module>pulsar-client-tools</module>
<module>pulsar-client-tools-test</module>
<module>pulsar-websocket</module>
@@ -123,7 +122,7 @@ flexible messaging model and an intuitive client
API.</description>
<testRetryCount>1</testRetryCount>
<bookkeeper.version>4.7.0</bookkeeper.version>
- <zookeeper.version>3.4.10</zookeeper.version>
+ <zookeeper.version>3.5.4-beta</zookeeper.version>
<netty.version>4.1.21.Final</netty.version>
<storm.version>1.0.5</storm.version>
<jetty.version>9.3.11.v20160721</jetty.version>
@@ -140,7 +139,7 @@ flexible messaging model and an intuitive client
API.</description>
<dockerfile-maven.version>1.3.7</dockerfile-maven.version>
<typetools.version>0.5.0</typetools.version>
<protobuf2.version>2.4.1</protobuf2.version>
- <protobuf3.version>3.5.1</protobuf3.version>
+ <protobuf3.version>3.4.0</protobuf3.version>
<grpc.version>1.5.0</grpc.version>
<protoc-gen-grpc-java.version>1.0.0</protoc-gen-grpc-java.version>
<gson.version>2.8.2</gson.version>
@@ -252,7 +251,7 @@ flexible messaging model and an intuitive client
API.</description>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server-shaded</artifactId>
+ <artifactId>bookkeeper-server</artifactId>
<version>${bookkeeper.version}</version>
<exclusions>
<exclusion>
@@ -716,10 +715,9 @@ flexible messaging model and an intuitive client
API.</description>
<scope>import</scope>
</dependency>
- <!-- use shaded dependency util pulsar bump zookeeper version to 3.5 -->
<dependency>
<groupId>org.apache.distributedlog</groupId>
- <artifactId>distributedlog-core-shaded</artifactId>
+ <artifactId>distributedlog-core</artifactId>
<version>${bookkeeper.version}</version>
</dependency>
@@ -782,9 +780,10 @@ flexible messaging model and an intuitive client
API.</description>
<dependency>
<!-- We use MockedBookKeeper in many unit tests -->
<groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server-tests-shaded</artifactId>
+ <artifactId>bookkeeper-server</artifactId>
<version>${bookkeeper.version}</version>
<scope>test</scope>
+ <classifier>tests</classifier>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 600b374bf6..1c64c84be5 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -109,12 +109,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker-common</artifactId>
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java
index 3c2544b51c..288e14c103 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java
@@ -22,30 +22,22 @@
import static org.apache.pulsar.common.api.Commands.newLookupErrorResponse;
import static org.apache.pulsar.common.api.Commands.newLookupResponse;
+import io.netty.buffer.ByteBuf;
+
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
-import javax.ws.rs.DefaultValue;
import javax.ws.rs.Encoded;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
-import org.apache.pulsar.broker.lookup.LookupResult;
-import org.apache.pulsar.broker.web.NoSwaggerDocumentation;
import org.apache.pulsar.broker.web.PulsarWebResource;
import org.apache.pulsar.broker.web.RestException;
import
org.apache.pulsar.common.api.proto.PulsarApi.CommandLookupTopicResponse.LookupType;
@@ -58,11 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import dlshade.org.apache.commons.lang3.StringUtils;
-import io.netty.buffer.ByteBuf;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-
public class TopicLookupBase extends PulsarWebResource {
private static final String LOOKUP_PATH_V1 = "/lookup/v2/destination/";
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
index f43c50367e..210c2f99c7 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
@@ -21,11 +21,14 @@
import static com.google.common.base.Preconditions.checkState;
import com.google.common.collect.Maps;
+import com.google.protobuf.ByteString;
+
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.util.Recycler;
import io.netty.util.Recycler.Handle;
+
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -35,6 +38,7 @@
import java.util.NavigableMap;
import java.util.TreeMap;
import java.util.stream.Collectors;
+
import org.apache.bookkeeper.client.BookKeeper;
import org.apache.bookkeeper.client.api.DigestType;
import org.apache.bookkeeper.client.api.LedgerMetadata;
@@ -42,7 +46,6 @@
import org.apache.bookkeeper.proto.DataFormats;
import org.apache.bookkeeper.proto.DataFormats.LedgerMetadataFormat;
import org.apache.bookkeeper.proto.DataFormats.LedgerMetadataFormat.State;
-import org.apache.bookkeeper.shaded.com.google.protobuf.ByteString;
import org.apache.pulsar.broker.s3offload.OffloadIndexBlock;
import org.apache.pulsar.broker.s3offload.OffloadIndexEntry;
import org.slf4j.Logger;
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
index 0c2a37ed4c..72f514754f 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.pulsar.client.api;
+import com.google.common.collect.Sets;
+
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.LinkedList;
@@ -39,8 +41,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import dlshade.com.google.common.collect.Sets;
-
public class MessageDispatchThrottlingTest extends ProducerConsumerBase {
private static final Logger log =
LoggerFactory.getLogger(MessageDispatchThrottlingTest.class);
diff --git a/pulsar-client-admin-shaded-for-functions/pom.xml
b/pulsar-client-admin-shaded-for-functions/pom.xml
deleted file mode 100644
index e36681c572..0000000000
--- a/pulsar-client-admin-shaded-for-functions/pom.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar</artifactId>
- <version>2.1.0-incubating-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>pulsar-client-admin-shaded-for-functions</artifactId>
- <name>Pulsar Client Admin Shaded (for functions)</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-client-admin-original</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <!-- Shade all the dependencies to avoid conflicts -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <minimizeJar>false</minimizeJar>
-
- <artifactSet>
- <includes>
- <include>org.apache.pulsar:pulsar-common</include>
- <include>org.apache.bookkeeper:circe-checksum</include>
- <include>org.apache.pulsar:pulsar-io-core</include>
- <include>org.apache.pulsar:pulsar-client-original</include>
-
<include>org.apache.pulsar:pulsar-client-admin-original</include>
- <!-- client dependencies as below -->
- <include>org.apache.commons:commons-lang3</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>org.asynchttpclient:*</include>
- <include>io.netty:netty</include>
- <include>io.netty:netty-all</include>
- <include>io.netty:netty-codec-http</include>
- <include>io.netty:netty-tcnative-boringssl-static</include>
- <include>io.netty:netty-transport-native-epoll</include>
- <include>org.reactivestreams:reactive-streams</include>
- <include>com.typesafe.netty:netty-reactive-streams</include>
- <include>org.javassist:javassist</include>
- <include>com.google.protobuf:protobuf-java</include>
- <include>com.google.guava:guava</include>
- <include>com.google.code.gson:gson</include>
- <include>com.fasterxml.jackson.core</include>
- <include>com.fasterxml.jackson.module</include>
- <include>net.jpountz.lz4:lz4</include>
- <include>com.yahoo.datasketches:sketches-core</include>
- <include>org.apache.httpcomponents:httpclient</include>
- <include>commons-logging:commons-logging</include>
- <include>org.apache.httpcomponents:httpcore</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>net.jpountz.lz4:lz4</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
- <artifact>org.apache.pulsar:pulsar-common</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
- <artifact>org.apache.bookkeeper:circe-checksum</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
- <artifact>org.apache.pulsar:pulsar-io-core</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
- <artifact>org.apache.pulsar:pulsar-client-original</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
-
<artifact>org.apache.pulsar:pulsar-client-admin-original</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- <filter>
- <artifact>commons-logging:commons-logging</artifact>
- <includes>
- <include>**</include>
- </includes>
- </filter>
- </filters>
- <relocations>
- <relocation>
- <pattern>org.asynchttpclient</pattern>
-
<shadedPattern>org.apache.pulsar.shade.org.asynchttpclient</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.http</pattern>
-
<shadedPattern>org.apache.pulsar.shade.org.apache.http</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.commons</pattern>
-
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google</pattern>
-
<shadedPattern>org.apache.pulsar.shade.com.google</shadedPattern>
- </relocation>
- <relocation>
- <pattern>io.netty</pattern>
-
<shadedPattern>org.apache.pulsar.shade.io.netty</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.scurrilous.circe</pattern>
-
<shadedPattern>org.apache.pulsar.shade.com.scurrilous.circe</shadedPattern>
- </relocation>
- <relocation>
- <pattern>net.jpountz</pattern>
-
<shadedPattern>org.apache.pulsar.shade.net.jpountz</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.yahoo.datasketches</pattern>
-
<shadedPattern>org.apache.pulsar.shade.com.yahoo.datasketches</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.yahoo.sketches</pattern>
-
<shadedPattern>org.apache.pulsar.shade.com.yahoo.sketches</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml
index 702a29e246..4ea2814bd1 100644
--- a/pulsar-client-admin/pom.xml
+++ b/pulsar-client-admin/pom.xml
@@ -48,16 +48,10 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-functions-proto-shaded</artifactId>
+ <artifactId>pulsar-functions-proto</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
+
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
diff --git
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
index e5bb716879..7c2d907f55 100644
---
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
+++
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
@@ -18,13 +18,13 @@
*/
package org.apache.pulsar.client.admin;
+import java.util.List;
+
import
org.apache.pulsar.client.admin.PulsarAdminException.NotAuthorizedException;
import org.apache.pulsar.client.admin.PulsarAdminException.NotFoundException;
import
org.apache.pulsar.client.admin.PulsarAdminException.PreconditionFailedException;
-import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
-import
org.apache.pulsar.functions.shaded.proto.InstanceCommunication.FunctionStatusList;
-
-import java.util.List;
+import org.apache.pulsar.functions.proto.Function.FunctionDetails;
+import
org.apache.pulsar.functions.proto.InstanceCommunication.FunctionStatusList;
/**
* Admin interface for function management.
diff --git
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
index 66da4978b8..1e2ae22cd4 100644
---
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
+++
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
@@ -18,20 +18,15 @@
*/
package org.apache.pulsar.client.admin.internal;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.pulsar.client.admin.Functions;
-import org.apache.pulsar.client.admin.PulsarAdminException;
-import org.apache.pulsar.client.api.Authentication;
-import org.apache.pulsar.common.policies.data.*;
-import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
-import
org.apache.pulsar.functions.shaded.proto.InstanceCommunication.FunctionStatusList;
-import org.glassfish.jersey.media.multipart.FormDataBodyPart;
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
+import com.google.protobuf.AbstractMessage.Builder;
+import com.google.protobuf.MessageOrBuilder;
+import com.google.protobuf.util.JsonFormat;
-import org.apache.pulsar.functions.shaded.com.google.protobuf.MessageOrBuilder;
-import
org.apache.pulsar.functions.shaded.com.google.protobuf.AbstractMessage.Builder;
-import org.apache.pulsar.functions.shaded.com.google.protobuf.util.JsonFormat;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
import javax.ws.rs.ClientErrorException;
import javax.ws.rs.client.Entity;
@@ -39,11 +34,18 @@
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.StandardCopyOption;
-import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.pulsar.client.admin.Functions;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.api.Authentication;
+import org.apache.pulsar.common.policies.data.ErrorData;
+import org.apache.pulsar.functions.proto.Function.FunctionDetails;
+import
org.apache.pulsar.functions.proto.InstanceCommunication.FunctionStatusList;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
@Slf4j
public class FunctionsImpl extends BaseResource implements Functions {
@@ -199,11 +201,11 @@ public void downloadFunction(String destinationPath,
String path) throws PulsarA
throw getApiException(e);
}
}
-
+
public static void mergeJson(String json, Builder builder) throws
IOException {
JsonFormat.parser().merge(json, builder);
}
-
+
public static String printJson(MessageOrBuilder msg) throws IOException {
return JsonFormat.printer().print(msg);
}
diff --git
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
index 83220d0270..3d0bb2b6e8 100644
---
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
+++
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
@@ -31,6 +31,11 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
+import com.google.gson.Gson;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -53,9 +58,7 @@
import org.apache.pulsar.functions.api.Context;
import org.apache.pulsar.functions.api.Function;
import org.apache.pulsar.functions.api.utils.DefaultSerDe;
-import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
-import org.apache.pulsar.functions.shaded.io.netty.buffer.ByteBuf;
-import org.apache.pulsar.functions.shaded.io.netty.buffer.ByteBufUtil;
+import org.apache.pulsar.functions.proto.Function.FunctionDetails;
import org.apache.pulsar.functions.utils.Reflections;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -65,8 +68,6 @@
import org.testng.annotations.ObjectFactory;
import org.testng.annotations.Test;
-import com.google.gson.Gson;
-
/**
* Unit test of {@link CmdFunctions}.
*/
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index 30103c7360..71d0090f80 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -18,6 +18,11 @@
*/
package org.apache.pulsar.admin.cli;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.isNull;
+import static org.apache.bookkeeper.common.concurrent.FutureUtils.result;
+
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.beust.jcommander.converters.StringConverter;
@@ -28,9 +33,31 @@
import com.google.gson.GsonBuilder;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
-import net.jodah.typetools.TypeResolver;
+
import org.apache.bookkeeper.api.StorageClient;
import org.apache.bookkeeper.api.kv.Table;
import org.apache.bookkeeper.api.kv.result.KeyValue;
@@ -46,19 +73,14 @@
import org.apache.pulsar.functions.api.SerDe;
import org.apache.pulsar.functions.api.utils.DefaultSerDe;
import org.apache.pulsar.functions.instance.InstanceConfig;
+import org.apache.pulsar.functions.proto.Function.FunctionDetails;
+import org.apache.pulsar.functions.proto.Function.ProcessingGuarantees;
+import org.apache.pulsar.functions.proto.Function.Resources;
+import org.apache.pulsar.functions.proto.Function.SinkSpec;
+import org.apache.pulsar.functions.proto.Function.SourceSpec;
+import org.apache.pulsar.functions.proto.Function.SubscriptionType;
import org.apache.pulsar.functions.runtime.ProcessRuntimeFactory;
import org.apache.pulsar.functions.runtime.RuntimeSpawner;
-import org.apache.pulsar.functions.shaded.io.netty.buffer.ByteBuf;
-import org.apache.pulsar.functions.shaded.io.netty.buffer.ByteBufUtil;
-import org.apache.pulsar.functions.shaded.io.netty.buffer.Unpooled;
-import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
-import org.apache.pulsar.functions.shaded.proto.Function.ProcessingGuarantees;
-import org.apache.pulsar.functions.shaded.proto.Function.Resources;
-import org.apache.pulsar.functions.shaded.proto.Function.SinkSpec;
-import org.apache.pulsar.functions.shaded.proto.Function.SourceSpec;
-import org.apache.pulsar.functions.shaded.proto.Function.SubscriptionType;
-import org.apache.pulsar.functions.sink.PulsarSink;
-import org.apache.pulsar.functions.source.PulsarSource;
import org.apache.pulsar.functions.utils.FunctionConfig;
import org.apache.pulsar.functions.utils.Reflections;
import org.apache.pulsar.functions.utils.Utils;
@@ -66,27 +88,7 @@
import org.apache.pulsar.functions.windowing.WindowFunctionExecutor;
import org.apache.pulsar.functions.windowing.WindowUtils;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.net.MalformedURLException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Objects.isNull;
-import static org.apache.bookkeeper.common.concurrent.FutureUtils.result;
+import net.jodah.typetools.TypeResolver;
@Slf4j
@Parameters(commandDescription = "Interface for managing Pulsar Functions
(lightweight, Lambda-style compute processes that work with Pulsar)")
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index 04e73bffb7..69553570b9 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -25,39 +25,37 @@
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import net.jodah.typetools.TypeResolver;
+
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.internal.FunctionsImpl;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.functions.api.utils.IdentityFunction;
-import org.apache.pulsar.functions.shaded.proto.Function;
-import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
-import org.apache.pulsar.functions.shaded.proto.Function.Resources;
-import org.apache.pulsar.functions.shaded.proto.Function.ProcessingGuarantees;
-import org.apache.pulsar.functions.shaded.proto.Function.SinkSpec;
-import org.apache.pulsar.functions.shaded.proto.Function.SourceSpec;
-import org.apache.pulsar.functions.sink.PulsarSink;
-import org.apache.pulsar.functions.source.PulsarSource;
+import org.apache.pulsar.functions.proto.Function;
+import org.apache.pulsar.functions.proto.Function.FunctionDetails;
+import org.apache.pulsar.functions.proto.Function.ProcessingGuarantees;
+import org.apache.pulsar.functions.proto.Function.Resources;
+import org.apache.pulsar.functions.proto.Function.SinkSpec;
+import org.apache.pulsar.functions.proto.Function.SourceSpec;
import org.apache.pulsar.functions.utils.FunctionConfig;
import org.apache.pulsar.functions.utils.Reflections;
import org.apache.pulsar.functions.utils.SinkConfig;
import org.apache.pulsar.functions.utils.Utils;
import org.apache.pulsar.io.core.Sink;
-import org.apache.pulsar.io.core.Source;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.net.MalformedURLException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
+import net.jodah.typetools.TypeResolver;
-@Slf4j
@Getter
@Parameters(commandDescription = "Interface for managing Pulsar Sinks (Egress
data from Pulsar)")
public class CmdSinks extends CmdBase {
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index 1583589055..bc2ce6a241 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -25,39 +25,31 @@
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.util.Map;
+
import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import net.jodah.typetools.TypeResolver;
+
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.internal.FunctionsImpl;
-import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.functions.api.utils.IdentityFunction;
-import org.apache.pulsar.functions.shaded.proto.Function;
-import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
-import org.apache.pulsar.functions.shaded.proto.Function.Resources;
-import org.apache.pulsar.functions.shaded.proto.Function.ProcessingGuarantees;
-import org.apache.pulsar.functions.shaded.proto.Function.SinkSpec;
-import org.apache.pulsar.functions.shaded.proto.Function.SourceSpec;
-import org.apache.pulsar.functions.sink.PulsarSink;
-import org.apache.pulsar.functions.source.PulsarSource;
+import org.apache.pulsar.functions.proto.Function.FunctionDetails;
+import org.apache.pulsar.functions.proto.Function.ProcessingGuarantees;
+import org.apache.pulsar.functions.proto.Function.Resources;
+import org.apache.pulsar.functions.proto.Function.SinkSpec;
+import org.apache.pulsar.functions.proto.Function.SourceSpec;
import org.apache.pulsar.functions.utils.FunctionConfig;
import org.apache.pulsar.functions.utils.Reflections;
import org.apache.pulsar.functions.utils.SourceConfig;
import org.apache.pulsar.functions.utils.Utils;
-import org.apache.pulsar.io.core.Sink;
import org.apache.pulsar.io.core.Source;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.net.MalformedURLException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
+import net.jodah.typetools.TypeResolver;
-@Slf4j
@Getter
@Parameters(commandDescription = "Interface for managing Pulsar Source
(Ingress data to Pulsar)")
public class CmdSources extends CmdBase {
diff --git a/pulsar-functions/instance/pom.xml
b/pulsar-functions/instance/pom.xml
index bcdf780dc4..569aca7d07 100644
--- a/pulsar-functions/instance/pom.xml
+++ b/pulsar-functions/instance/pom.xml
@@ -59,6 +59,18 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>pulsar-functions-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>pulsar-client-original</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>stream-storage-java-client</artifactId>
diff --git
a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
index 0f826aca55..86ea562b5e 100644
---
a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
+++
b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
@@ -24,7 +24,7 @@
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.ConsumerBuilder;
import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;;
+import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.functions.api.SerDe;
import org.apache.pulsar.functions.api.utils.DefaultSerDe;
import org.apache.pulsar.functions.utils.FunctionConfig;
diff --git a/pulsar-functions/pom.xml b/pulsar-functions/pom.xml
index 99c6947b6d..02ab2e43e9 100644
--- a/pulsar-functions/pom.xml
+++ b/pulsar-functions/pom.xml
@@ -43,7 +43,6 @@
<module>runtime-shaded</module>
<module>runtime-all</module>
<module>worker</module>
- <module>worker-shaded</module>
</modules>
<dependencyManagement>
diff --git a/pulsar-functions/runtime-all/pom.xml
b/pulsar-functions/runtime-all/pom.xml
index 3d9201c627..813f4c659d 100644
--- a/pulsar-functions/runtime-all/pom.xml
+++ b/pulsar-functions/runtime-all/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-functions-runtime-shaded</artifactId>
+ <artifactId>pulsar-functions-runtime</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
diff --git a/pulsar-functions/runtime-shaded/pom.xml
b/pulsar-functions/runtime-shaded/pom.xml
index 1536e21b63..7b165b6c56 100644
--- a/pulsar-functions/runtime-shaded/pom.xml
+++ b/pulsar-functions/runtime-shaded/pom.xml
@@ -39,11 +39,6 @@
<artifactId>pulsar-functions-runtime</artifactId>
<version>${project.parent.version}</version>
<exclusions>
- <!-- exclude `pulsar-client-admin-shaded-for-functions` here, this
allows worker and runtime to use unshaded clients -->
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client-admin-shaded-for-functions</artifactId>
- </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
@@ -89,7 +84,7 @@
<dependency>
<groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server-shaded</artifactId>
+ <artifactId>bookkeeper-server</artifactId>
</dependency>
<dependency>
diff --git a/pulsar-functions/runtime/pom.xml b/pulsar-functions/runtime/pom.xml
index 6feecd94aa..419d77bd99 100644
--- a/pulsar-functions/runtime/pom.xml
+++ b/pulsar-functions/runtime/pom.xml
@@ -59,7 +59,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/pulsar-functions/utils/pom.xml b/pulsar-functions/utils/pom.xml
index e831ca9d7c..b278ed753d 100644
--- a/pulsar-functions/utils/pom.xml
+++ b/pulsar-functions/utils/pom.xml
@@ -35,95 +35,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-client-admin-shaded-for-functions</artifactId>
+ <artifactId>pulsar-client-admin-original</artifactId>
<version>${project.version}</version>
- <!-- exclude shaded dependencies to avoid conflicts -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client-admin-original</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions-proto</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-io-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client-original</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.asynchttpclient</groupId>
- <artifactId>async-http-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.jpountz.lz4</groupId>
- <artifactId>lz4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcomponents-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcomponents-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.yahoo.datasketches</groupId>
- <artifactId>sketches-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/pulsar-functions/worker/pom.xml b/pulsar-functions/worker/pom.xml
index 22137bad24..72088610ea 100644
--- a/pulsar-functions/worker/pom.xml
+++ b/pulsar-functions/worker/pom.xml
@@ -36,74 +36,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pulsar-functions-runtime-shaded</artifactId>
+ <artifactId>pulsar-functions-runtime</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-lite</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.protobuf.nano</groupId>
- <artifactId>protobuf-javanano</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf-lite</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf-nano</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions-utils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions-metrics</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions-instance</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-socks</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -159,10 +93,9 @@
<artifactId>jetty-servlet</artifactId>
</dependency>
- <!-- use shaded dependency util pulsar bump zookeeper version to 3.5 -->
<dependency>
<groupId>org.apache.distributedlog</groupId>
- <artifactId>distributedlog-core-shaded</artifactId>
+ <artifactId>distributedlog-core</artifactId>
</dependency>
</dependencies>
diff --git
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java
index 494368f348..b64a7fad2e 100644
---
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java
+++
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java
@@ -39,12 +39,10 @@
import org.apache.distributedlog.metadata.DLMetadata;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.PulsarClientException;
-import org.apache.pulsar.common.util.Codec;
import org.apache.pulsar.functions.proto.Function;
import org.apache.pulsar.functions.worker.dlog.DLInputStream;
import org.apache.pulsar.functions.worker.dlog.DLOutputStream;
-
-import dlshade.org.apache.zookeeper.KeeperException.Code;
+import org.apache.zookeeper.KeeperException.Code;
@Slf4j
public final class Utils {
diff --git
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
index d306efa1bb..6d5cd1ae20 100644
---
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
+++
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
@@ -55,7 +55,6 @@
import org.apache.pulsar.functions.proto.Function.PackageLocationMetaData;
import org.apache.pulsar.functions.proto.InstanceCommunication;
import org.apache.pulsar.functions.proto.InstanceCommunication.FunctionStatus;
-import org.apache.pulsar.functions.source.PulsarSource;
import org.apache.pulsar.functions.worker.FunctionMetaDataManager;
import org.apache.pulsar.functions.worker.FunctionRuntimeManager;
import org.apache.pulsar.functions.worker.MembershipManager;
diff --git a/pulsar-zookeeper-utils/pom.xml b/pulsar-zookeeper-utils/pom.xml
index f340c3c06b..2e40ce126c 100644
--- a/pulsar-zookeeper-utils/pom.xml
+++ b/pulsar-zookeeper-utils/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server-shaded</artifactId>
+ <artifactId>bookkeeper-server</artifactId>
</dependency>
<dependency>
diff --git
a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
index 09a75d0040..05fe4684b2 100644
---
a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
+++
b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
@@ -118,12 +118,13 @@ private void runZookeeper(int maxCC) throws IOException {
}
try {
+ // Allow all commands on ZK control port
+ System.setProperty("zookeeper.4lw.commands.whitelist", "*");
zks = new ZooKeeperServer(zkDataDir, zkDataDir,
ZooKeeperServer.DEFAULT_TICK_TIME);
serverFactory = new NIOServerCnxnFactory();
serverFactory.configure(new
InetSocketAddress(ZooKeeperDefaultPort), maxCC);
serverFactory.startup(zks);
} catch (Exception e) {
- // TODO Auto-generated catch block
LOG.error("Exception while instantiating ZooKeeper", e);
}
diff --git
a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZookeeperClientFactoryImpl.java
b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZookeeperClientFactoryImpl.java
index 18ab9d87c8..9d8b0988d3 100644
---
a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZookeeperClientFactoryImpl.java
+++
b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZookeeperClientFactoryImpl.java
@@ -75,7 +75,7 @@
return null;
});
- } catch (IOException e) {
+ } catch (IllegalArgumentException | IOException e) {
future.completeExceptionally(e);
}
diff --git
a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
b/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
index c53e1bc40d..20de01ae9b 100644
---
a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
+++
b/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
@@ -48,6 +48,8 @@ public ZookeeperServerTest(int zkPort) throws IOException {
public void start() throws IOException {
try {
+ // Allow all commands on ZK control port
+ System.setProperty("zookeeper.4lw.commands.whitelist", "*");
zks = new ZooKeeperServer(zkTmpDir, zkTmpDir,
ZooKeeperServer.DEFAULT_TICK_TIME);
zks.setMaxSessionTimeout(20000);
serverFactory = new NIOServerCnxnFactory();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
