fix(hubble): parent override children dep version (#549)

apache · Dec 12, 2023 · 9676b05 · 9676b05
1 parent 0e1caa0
commit 9676b05
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 36 deletions.
diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt
@@ -256,7 +256,6 @@ nimbus-jose-jwt-9.8.1.jar
 okhttp-2.7.5.jar
 okhttp-4.10.0.jar
 logging-interceptor-4.10.0.jar
-kotlin-stdlib-1.2.71.jar
 kotlin-stdlib-1.6.20.jar
 kotlin-stdlib-common-1.5.31.jar
 kotlin-stdlib-jdk7-1.2.71.jar

diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml
@@ -33,7 +33,6 @@
         <app.port>36320</app.port>
         <mybatis.starter.version>2.1.0</mybatis.starter.version>
         <mybatis.plus.starter.version>3.3.0</mybatis.plus.starter.version>
-        <okhttp.version>4.10.0</okhttp.version>
     </properties>
 
     <dependencies>
@@ -145,6 +144,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
         <!--overwrite okhttp and kotlin for version conflict-->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
@@ -153,32 +157,13 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
-            <version>1.6.20</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-common</artifactId>
-            <version>1.5.31</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>okhttp-bom</artifactId>
-                <version>${okhttp.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <profiles>
         <profile>
             <id>unit-test</id>
@@ -193,21 +178,6 @@
 
     <build>
         <plugins>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>org.apache.hugegraph.HugeGraphHubble</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml
@@ -43,10 +43,12 @@
 
     <properties>
         <springboot.version>2.1.8.RELEASE</springboot.version>
+        <okhttp.version>4.10.0</okhttp.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <!-- TODO: put necessary dependencies in hubble-be not here -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
@@ -67,6 +69,29 @@
                 <version>${springboot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-stdlib</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib</artifactId>
+                <version>1.6.20</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-bom</artifactId>
+                <version>${okhttp.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-common</artifactId>
+                <version>1.5.31</version>
             </dependency>
         </dependencies>
     </dependencyManagement>