Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
pulsar
提交
41c9713f
pulsar
项目概览
apache
/
pulsar
通知
129
Star
40
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
pulsar
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Pages
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
提交
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
41c9713f
编写于
2月 27, 2018
作者:
S
Sijie Guo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Address conflicts after merged
上级
599077a7
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
15 addition
and
39 deletion
+15
-39
pom.xml
pom.xml
+0
-1
pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java
.../pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java
+0
-1
pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
...pache/pulsar/client/impl/BrokerClientIntegrationTest.java
+0
-2
pulsar-client-admin-shaded/pom.xml
pulsar-client-admin-shaded/pom.xml
+1
-19
pulsar-client-shaded/pom.xml
pulsar-client-shaded/pom.xml
+14
-15
pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
...ain/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
+0
-1
未找到文件。
pom.xml
浏览文件 @
41c9713f
...
...
@@ -615,7 +615,6 @@ flexible messaging model and an intuitive client API.</description>
<dependencies>
<!-- These dependencies are common to all the submodules -->
<!-- use log4j2 binding for testing -->
<dependency>
<groupId>
org.apache.pulsar
</groupId>
<artifactId>
buildtools
</artifactId>
...
...
pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java
浏览文件 @
41c9713f
...
...
@@ -44,7 +44,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.atomic.AtomicReference
;
import
com.google.common.collect.Maps
;
import
org.apache.bookkeeper.test.PortManager
;
import
org.apache.bookkeeper.util.ZkUtils
;
import
org.apache.commons.lang3.SystemUtils
;
...
...
pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
浏览文件 @
41c9713f
...
...
@@ -84,8 +84,6 @@ import org.testng.collections.Maps;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Sets
;
import
static
org
.
apache
.
pulsar
.
broker
.
auth
.
MockedPulsarServiceBaseTest
.
retryStrategically
;
public
class
BrokerClientIntegrationTest
extends
ProducerConsumerBase
{
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
BrokerClientIntegrationTest
.
class
);
...
...
pulsar-client-admin-shaded/pom.xml
浏览文件 @
41c9713f
...
...
@@ -92,33 +92,15 @@
<include>
**
</include>
</includes>
</filter>
<filter>
<artifact>
org.apache.pulsar:pulsar-common
</artifact>
<includes>
<include>
**
</include>
</includes>
</filter>
<filter>
<artifact>
org.apache.pulsar:pulsar-checksum
</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>
</filters>
<relocations>
<relocation>
<relocation>
<pattern>
org.asynchttpclient
</pattern>
<shadedPattern>
org.apache.pulsar.admin.shade.org.asynchttpclient
</shadedPattern>
</relocation>
...
...
pulsar-client-shaded/pom.xml
浏览文件 @
41c9713f
...
...
@@ -59,10 +59,7 @@
<artifactSet>
<includes>
<include>
org.apache.pulsar:pulsar-common
</include>
<include>
org.apache.bookkeeper:circe-checksum
</include>
<include>
org.apache.pulsar:pulsar-client-original
</include>
<!-- client dependencies -->
<include>
org.apache.commons:commons-lang3
</include>
<include>
commons-codec:commons-codec
</include>
<include>
commons-collections:commons-collections
</include>
...
...
@@ -79,6 +76,8 @@
<include>
io.netty:netty
</include>
<include>
io.netty:netty-all
</include>
<include>
io.netty:netty-tcnative-boringssl-static
</include>
<include>
org.apache.pulsar:pulsar-common
</include>
<include>
org.apache.bookkeeper:circe-checksum
</include>
<include>
net.jpountz.lz4:lz4
</include>
<include>
com.yahoo.datasketches:sketches-core
</include>
<include>
org.apache.httpcomponents:httpclient
</include>
...
...
@@ -93,18 +92,6 @@
<include>
**
</include>
</includes>
</filter>
<filter>
<artifact>
org.apache.pulsar:pulsar-common
</artifact>
<includes>
<include>
**
</include>
</includes>
</filter>
<filter>
<artifact>
org.apache.pulsar:pulsar-checksum
</artifact>
<includes>
<include>
**
</include>
</includes>
</filter>
<filter>
<artifact>
org.apache.pulsar:pulsar-client-original
</artifact>
<includes>
...
...
@@ -139,6 +126,18 @@
<pattern>
io.netty
</pattern>
<shadedPattern>
org.apache.pulsar.shade.io.netty
</shadedPattern>
</relocation>
<relocation>
<pattern>
org.apache.pulsar.common
</pattern>
<shadedPattern>
org.apache.pulsar.shade.org.apache.pulsar.common
</shadedPattern>
</relocation>
<relocation>
<pattern>
org.apache.pulsar.policies
</pattern>
<shadedPattern>
org.apache.pulsar.shade.org.apache.pulsar.policies
</shadedPattern>
</relocation>
<relocation>
<pattern>
org.apache.pulsar.checksum
</pattern>
<shadedPattern>
org.apache.pulsar.shade.org.apache.pulsar.checksum
</shadedPattern>
</relocation>
<relocation>
<pattern>
com.scurrilous.circe
</pattern>
<shadedPattern>
org.apache.pulsar.shade.com.scurrilous.circe
</shadedPattern>
...
...
pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
浏览文件 @
41c9713f
...
...
@@ -25,7 +25,6 @@ import java.util.Arrays;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Properties
;
import
java.util.function.BiFunction
;
import
java.util.function.BiFunction
;
import
org.apache.commons.lang3.StringUtils
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录