Skip to content

Commit

Permalink
[MINOR] improvement(all): Create a server-common module to reduce cli…
Browse files Browse the repository at this point in the history
…ent-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
  • Loading branch information
maobaolong authored Aug 12, 2024
1 parent 6491184 commit 25d25ca
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 2 deletions.
2 changes: 1 addition & 1 deletion coordinator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dashboard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-common</artifactId>
<artifactId>rss-server-common</artifactId>
</dependency>
</dependencies>

Expand Down
20 changes: 20 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
<module>client</module>
<module>integration-test/common</module>
<module>cli</module>
<module>server-common</module>
</modules>

<dependencies>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
45 changes: 45 additions & 0 deletions server-common/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 4 additions & 0 deletions server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 25d25ca

Please sign in to comment.