chore: fix pom for submodules in hugegraph-pd

apache · Aug 7, 2023 · cbdd65a · cbdd65a
1 parent 3910af8
commit cbdd65a
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 42 deletions.
diff --git a/hugegraph-pd/build.sh b/hugegraph-pd/build.sh
@@ -20,6 +20,7 @@ export PATH=$MAVEN_3_5_3_BIN:$ORACLEJDK_11_0_7_BIN:$PATH
 export JAVA_HOME=$ORACLEJDK_11_0_7_HOME
 export MAVEN_HOME=$MAVEN_3_5_3_HOME
 
+# TODO: remove later
 readonly REPO_URL=http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots
 
 if [ ! -n "$1" ] ;then
@@ -35,4 +36,4 @@ ls output
 echo "mv dist done"
 echo "show output...."
 ls output
-echo "show output done"
+echo "show output done"
diff --git a/hugegraph-pd/hg-pd-client/pom.xml b/hugegraph-pd/hg-pd-client/pom.xml
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.hugegraph</groupId>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -66,7 +66,8 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
+            <version>1.28</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/hugegraph-pd/hg-pd-clitools/pom.xml b/hugegraph-pd/hg-pd-clitools/pom.xml
@@ -20,7 +20,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <groupId>org.apache.hugegraph</groupId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -71,4 +71,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/hugegraph-pd/hg-pd-common/pom.xml b/hugegraph-pd/hg-pd-common/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.hugegraph</groupId>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/hugegraph-pd/hg-pd-core/pom.xml b/hugegraph-pd/hg-pd-core/pom.xml
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.hugegraph</groupId>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -58,6 +58,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <version>5.3.20</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hugegraph</groupId>
@@ -66,10 +67,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
+            <version>2.5.14</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -88,4 +91,4 @@
             <version>${revision}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/TaskScheduleService.java b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/TaskScheduleService.java
@@ -710,8 +710,6 @@ public Boolean dbCompaction(String tableName) throws PDException {
 
     /**
      * 判断是否能把一个store的分区全部迁出，给出判断结果和迁移方案
-     *
-     * @author [email protected]
      */
     public Map<String, Object> canAllPartitionsMovedOut(Metapb.Store sourceStore) throws
                                                                                   PDException {

diff --git a/hugegraph-pd/hg-pd-dist/pom.xml b/hugegraph-pd/hg-pd-dist/pom.xml
@@ -20,7 +20,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <groupId>org.apache.hugegraph</groupId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>

diff --git a/hugegraph-pd/hg-pd-grpc/pom.xml b/hugegraph-pd/hg-pd-grpc/pom.xml
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.hugegraph</groupId>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -135,4 +135,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/hugegraph-pd/hg-pd-service/pom.xml b/hugegraph-pd/hg-pd-service/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.apache.hugegraph</groupId>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>hugegraph-pd</artifactId>
+    <artifactId>hg-pd-service</artifactId>
 
     <properties>
         <jetcd-version>0.5.10</jetcd-version>
@@ -65,6 +65,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.5.14</version>
             <!-- Exclude the Tomcat dependency -->
             <exclusions>
                 <!-- Exclude the Tomcat dependency -->
@@ -82,18 +83,22 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>2.5.14</version>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.7.12</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
+            <version>2.5.14</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
+            <version>2.5.14</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
@@ -103,6 +108,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util -->
         <dependency>
@@ -142,4 +148,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.hugegraph</groupId>
-        <artifactId>hugegraph-pd-root</artifactId>
+        <artifactId>hugegraph-pd</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -85,15 +85,17 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
+            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
+            <version>5.3.20</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
+            <version>5.3.20</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -164,6 +166,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>2.5.14</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -364,4 +367,4 @@
         </resources>
     </build>
 
-</project>
+</project>
diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml
@@ -20,17 +20,15 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          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>
-
-    <groupId>org.apache.hugegraph</groupId>
-    <artifactId>hugegraph-pd-root</artifactId>
+    <artifactId>hugegraph-pd</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
 
-    <!-- TODO: replace it with non-parent mode & use apache as parent  -->
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.14</version>
+        <groupId>org.apache.hugegraph</groupId>
+        <artifactId>hugegraph</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modules>
@@ -46,7 +44,6 @@
     </modules>
 
     <properties>
-        <revision>1.5.0</revision>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <log4j2.version>2.17.0</log4j2.version>
@@ -76,21 +73,11 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <id>Baidu_Local</id>
-            <url>http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local</url>
-        </repository>
-        <snapshotRepository>
-            <id>Baidu_Local_Snapshots</id>
-            <url>http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <build>
         <plugins>
             <plugin>
@@ -148,7 +135,7 @@
                                 <include>*.tar.gz</include>
                                 <include>.flattened-pom.xml</include>
                                 <!-- WARN: delete dist dir may influence dev? -->
-                                <!-- <include>dist</include>-->
+                                <!-- <include>dist/**</include>-->
                             </includes>
                             <followSymlinks>false</followSymlinks>
                         </fileset>
@@ -282,4 +269,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/hugegraph-pd/settings.xml b/hugegraph-pd/settings.xml
@@ -38,6 +38,7 @@
     </servers>
     <profiles>
         <profile>
+            <!-- TODO: remove later -->
             <id>baidu</id>
             <repositories>
                 <repository>
@@ -129,4 +130,4 @@
     <activeProfiles>
         <activeProfile>baidu</activeProfile> <!--别忘了激活配置 -->
     </activeProfiles>
-</settings>
+</settings>
diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
     <modules>
         <module>hugegraph-server</module>
         <!--  TODO: uncomment when merge into pd and store-->
-<!--        <module>hugegraph-pd</module>-->
+        <module>hugegraph-pd</module>
 <!--        <module>hugegraph-store</module>-->
     </modules>
 </project>