You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ma...@apache.org on 2022/07/15 08:04:42 UTC
[pulsar] branch branch-2.10 updated: [Branch-2.10] Remove redundant pulsar-zookeeper-utils module (#16258)
This is an automated email from the ASF dual-hosted git repository.
mattisonchao pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 6a6b04d98ac [Branch-2.10] Remove redundant pulsar-zookeeper-utils module (#16258)
6a6b04d98ac is described below
commit 6a6b04d98ace44a076a7fb0470c89a55b42ae106
Author: Qiang Zhao <ma...@gmail.com>
AuthorDate: Fri Jul 15 16:04:36 2022 +0800
[Branch-2.10] Remove redundant pulsar-zookeeper-utils module (#16258)
Cherry-picked pull request #16109
---
pom.xml | 2 -
pulsar-broker-common/pom.xml | 19 ++-
pulsar-broker/pom.xml | 55 +++++--
.../apache/pulsar/stats/CacheMetricsCollector.java | 5 +-
.../java/org/apache/pulsar/stats/package-info.java | 0
.../pulsar/zookeeper/LocalBookkeeperEnsemble.java | 3 +-
.../org/apache/pulsar/zookeeper/package-info.java | 0
.../zookeeper/LocalBookkeeperEnsembleTest.java | 0
.../pulsar/zookeeper/ZookeeperServerTest.java | 0
pulsar-proxy/pom.xml | 6 -
pulsar-websocket/pom.xml | 6 -
pulsar-zookeeper-utils/pom.xml | 175 ---------------------
src/owasp-dependency-check-false-positives.xml | 5 -
13 files changed, 58 insertions(+), 218 deletions(-)
diff --git a/pom.xml b/pom.xml
index 543ead3f3b2..c1e91dfbe84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2066,7 +2066,6 @@ flexible messaging model and an intuitive client API.</description>
<module>pulsar-client-all</module>
<module>pulsar-websocket</module>
<module>pulsar-proxy</module>
- <module>pulsar-zookeeper-utils</module>
<module>pulsar-testclient</module>
<module>pulsar-broker-auth-athenz</module>
<module>pulsar-client-auth-athenz</module>
@@ -2129,7 +2128,6 @@ flexible messaging model and an intuitive client API.</description>
<module>pulsar-client-tools-test</module>
<module>pulsar-websocket</module>
<module>pulsar-proxy</module>
- <module>pulsar-zookeeper-utils</module>
<module>pulsar-testclient</module>
<module>pulsar-broker-auth-sasl</module>
<module>pulsar-client-auth-sasl</module>
diff --git a/pulsar-broker-common/pom.xml b/pulsar-broker-common/pom.xml
index 8a96d6e108b..9333f284c42 100644
--- a/pulsar-broker-common/pom.xml
+++ b/pulsar-broker-common/pom.xml
@@ -33,12 +33,6 @@
<description>Common classes used in multiple broker modules</description>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-metadata</artifactId>
@@ -50,6 +44,11 @@
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_jetty</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -70,6 +69,14 @@
<artifactId>jjwt-jackson</artifactId>
</dependency>
+ <!-- test -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bc-fips</artifactId>
+ <version>${bouncycastlefips.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 19dbda191ea..cd331ab4b56 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -88,6 +88,42 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>stream-storage-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.bookkeeper.tests</groupId>
+ <artifactId>stream-storage-tests-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.inferred</groupId>
+ <artifactId>freebuilder</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.auth</groupId>
+ <artifactId>google-auth-library-oauth2-http</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-tools-framework</artifactId>
@@ -119,12 +155,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- zookeeper server -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -281,6 +311,11 @@
<artifactId>simpleclient_hotspot</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_caffeine</artifactId>
+ </dependency>
+
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
@@ -569,14 +604,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-package-core</artifactId>
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java b/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
similarity index 91%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
index 5df9d3a4ca9..b298db12087 100644
--- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.pulsar.stats;
import lombok.experimental.UtilityClass;
@UtilityClass
public class CacheMetricsCollector {
-
public static final io.prometheus.client.cache.caffeine.CacheMetricsCollector CAFFEINE =
- new io.prometheus.client.cache.caffeine.CacheMetricsCollector()
- .register();
+ new io.prometheus.client.cache.caffeine.CacheMetricsCollector().register();
}
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/package-info.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
similarity index 99%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
index 37cbb841ad1..bb66ff4dede 100644
--- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
+
+/*
* This file is derived from LocalBookkeeperEnsemble from Apache BookKeeper
* http://bookkeeper.apache.org
*/
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/package-info.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java
diff --git a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
rename to pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
diff --git a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
rename to pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml
index 48604cc3247..82e899d70ef 100644
--- a/pulsar-proxy/pom.xml
+++ b/pulsar-proxy/pom.xml
@@ -37,12 +37,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker-common</artifactId>
diff --git a/pulsar-websocket/pom.xml b/pulsar-websocket/pom.xml
index 36988c49c33..4540d077d34 100644
--- a/pulsar-websocket/pom.xml
+++ b/pulsar-websocket/pom.xml
@@ -52,12 +52,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/pulsar-zookeeper-utils/pom.xml b/pulsar-zookeeper-utils/pom.xml
deleted file mode 100644
index 4e85f6698fe..00000000000
--- a/pulsar-zookeeper-utils/pom.xml
+++ /dev/null
@@ -1,175 +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.10.1</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <name>Pulsar ZooKeeper Utils</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>stream-storage-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>stream-storage-tests-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.inferred</groupId>
- <artifactId>freebuilder</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </dependency>
-
- <!-- `grpc-all` is excluded from `stream-storage-server` at root pom file -->
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.perfmark</groupId>
- <artifactId>perfmark-api</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bookkeeper.stats</groupId>
- <artifactId>prometheus-metrics-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>testmocks</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_caffeine</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/src/owasp-dependency-check-false-positives.xml b/src/owasp-dependency-check-false-positives.xml
index 3ea7844b9bd..dc14e83c685 100644
--- a/src/owasp-dependency-check-false-positives.xml
+++ b/src/owasp-dependency-check-false-positives.xml
@@ -27,11 +27,6 @@
</notes>
<cpe>cpe:/a:apache:http_server</cpe>
</suppress>
- <suppress>
- <notes>pulsar-zookeeper-utils gets mixed with zookeeper.</notes>
- <gav regex="true">org\.apache\.pulsar:.*</gav>
- <cpe>cpe:/a:apache:zookeeper</cpe>
- </suppress>
<suppress>
<notes>pulsar-package-bookkeeper-storage gets mixed with bookkeeper.</notes>
<gav regex="true">org\.apache\.pulsar:.*</gav>