This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi-shaded.git
The following commit(s) were added to refs/heads/master by this push:
new c2b3ad3 [KYUUBI-SHADED #36] Remove dependencyManagement in shaded
zookeeper pom
c2b3ad3 is described below
commit c2b3ad3b1adb7d5c8f2b066c494025ea3ec90fe9
Author: Cheng Pan <[email protected]>
AuthorDate: Thu Feb 29 14:51:23 2024 +0800
[KYUUBI-SHADED #36] Remove dependencyManagement in shaded zookeeper pom
### _Why are the changes needed?_
To gain a cleaner `pom.xml`.
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including
negative and positive cases if possible
- [x] Add screenshots for manual tests if appropriate
Manually tested, and the `dependencyManagement` block is removed after this
change.
```
...
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${netty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
...
```
- [ ] [Run
test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests)
locally before make a pull request
Closes #36 from pan3793/zk-pom.
f5d711d [Cheng Pan] Remove dependencyManagement in shaded zookeeper pom
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
.../kyuubi-relocated-zookeeper-34/pom.xml | 11 +----------
.../kyuubi-relocated-zookeeper-36/pom.xml | 18 +-----------------
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git
a/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/pom.xml
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/pom.xml
index fed1c9e..ef16fac 100644
--- a/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/pom.xml
+++ b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-34/pom.xml
@@ -39,16 +39,6 @@ under the License.
<jline.version>2.14.6</jline.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -71,6 +61,7 @@ under the License.
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
<exclusions>
<exclusion>
<!-- only required for ZK servers, not clients -->
diff --git
a/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/pom.xml
b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/pom.xml
index bbe663a..9f62b1c 100644
--- a/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/pom.xml
+++ b/kyuubi-relocated-zookeeper-parent/kyuubi-relocated-zookeeper-36/pom.xml
@@ -38,23 +38,6 @@ under the License.
<netty.version>4.1.91.Final</netty.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-bom</artifactId>
- <version>${netty.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<!-- kyuubi distribution provides logging classes -->
@@ -66,6 +49,7 @@ under the License.
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
<exclusions>
<exclusion>
<!-- kyuubi distribution provides logging classes -->
