This is an automated email from the ASF dual-hosted git repository.
rickyma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new 25d25ca4c [MINOR] improvement(all): Create a server-common module to
reduce client-side dependencies (#1884)
25d25ca4c is described below
commit 25d25ca4c1f307afce52d8ae13c7dd0acf328923
Author: maobaolong <baoloong...@tencent.com>
AuthorDate: Mon Aug 12 14:09:40 2024 +0800
[MINOR] improvement(all): Create a server-common module to reduce
client-side dependencies (#1884)
### What changes were proposed in this pull request?
Create a server-common module.
### Why are the changes needed?
Reduce client-side denpendencies.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
No need
---
coordinator/pom.xml | 2 +-
dashboard/pom.xml | 2 +-
pom.xml | 20 ++++++++++++++++++++
server-common/pom.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++
server/pom.xml | 4 ++++
5 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/coordinator/pom.xml b/coordinator/pom.xml
index eea080326..0ffbc770b 100644
--- a/coordinator/pom.xml
+++ b/coordinator/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.apache.uniffle</groupId>
- <artifactId>rss-common</artifactId>
+ <artifactId>rss-server-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
diff --git a/dashboard/pom.xml b/dashboard/pom.xml
index d63bdcd1c..cdf40439b 100644
--- a/dashboard/pom.xml
+++ b/dashboard/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.uniffle</groupId>
- <artifactId>rss-common</artifactId>
+ <artifactId>rss-server-common</artifactId>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 438e15c1e..80899ddba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
<module>client</module>
<module>integration-test/common</module>
<module>cli</module>
+ <module>server-common</module>
</modules>
<dependencies>
@@ -292,6 +293,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.uniffle</groupId>
+ <artifactId>rss-server-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>shuffle-server</artifactId>
@@ -375,6 +381,20 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.uniffle</groupId>
+ <artifactId>rss-server-common</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>client-mr</artifactId>
diff --git a/server-common/pom.xml b/server-common/pom.xml
new file mode 100644
index 000000000..3cb0b04c9
--- /dev/null
+++ b/server-common/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.uniffle</groupId>
+ <artifactId>uniffle-parent</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>rss-server-common</artifactId>
+ <name>Apache Uniffle Server Common</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.uniffle</groupId>
+ <artifactId>rss-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uniffle</groupId>
+ <artifactId>rss-common</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/server/pom.xml b/server/pom.xml
index 571946e29..3a82ca107 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -36,6 +36,10 @@
<groupId>org.apache.uniffle</groupId>
<artifactId>shuffle-storage</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.uniffle</groupId>
+ <artifactId>rss-server-common</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>shuffle-storage</artifactId>
