From e667183efa2827cabcf87c9d09602e92a30c81cb Mon Sep 17 00:00:00 2001 From: imbajin Date: Fri, 8 Dec 2023 19:03:20 +0800 Subject: [PATCH 1/8] fix(hubble): parent override children dep version WARN FOR EVERYONE, and we need add a TODO to avoid it happens again --- hugegraph-hubble/hubble-be/pom.xml | 48 +++++------------------------- hugegraph-hubble/pom.xml | 20 ++++--------- 2 files changed, 14 insertions(+), 54 deletions(-) diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index 301c6c347..d911165e8 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -139,46 +139,29 @@ kotlin-stdlib - com.squareup.okhttp + com.squareup.okhttp3 okhttp - - - - com.squareup.okhttp3 - okhttp - - org.jetbrains.kotlin - kotlin-stdlib - 1.6.20 + commons-fileupload + commons-fileupload + + org.jetbrains.kotlin kotlin-stdlib-common 1.5.31 - - commons-fileupload - commons-fileupload + com.squareup.okhttp3 + okhttp + ${okhttp.version} - - - - com.squareup.okhttp3 - okhttp-bom - ${okhttp.version} - pom - import - - - - unit-test @@ -193,21 +176,6 @@ - org.apache.maven.plugins maven-jar-plugin diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml index 5af407abc..42ebd2a1f 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -47,20 +47,7 @@ - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - io.netty - netty-bom - ${netty.version} - pom - import - + org.springframework.boot spring-boot-dependencies @@ -68,6 +55,11 @@ pom import + + org.jetbrains.kotlin + kotlin-stdlib + 1.6.20 + From e46f5d49d680a10a265db7f2d406d95f6078044f Mon Sep 17 00:00:00 2001 From: imbajin Date: Fri, 8 Dec 2023 19:25:26 +0800 Subject: [PATCH 2/8] Update pom.xml --- hugegraph-hubble/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml index 42ebd2a1f..8d6b0a3ad 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -48,6 +48,20 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + io.netty + netty-bom + ${netty.version} + pom + import + org.springframework.boot spring-boot-dependencies From a71201e95da8f71c5c92b9b47490716659eadc91 Mon Sep 17 00:00:00 2001 From: imbajin Date: Fri, 8 Dec 2023 19:41:23 +0800 Subject: [PATCH 3/8] sign --- hugegraph-hubble/hubble-be/pom.xml | 8 ++++---- hugegraph-hubble/pom.xml | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index d911165e8..fab251866 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -138,10 +138,10 @@ org.jetbrains.kotlin kotlin-stdlib - - com.squareup.okhttp3 - okhttp - + + + + diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml index 8d6b0a3ad..e1147fe35 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -48,20 +48,20 @@ - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - io.netty - netty-bom - ${netty.version} - pom - import - + + + + + + + + + + + + + + org.springframework.boot spring-boot-dependencies From 4e75a7232e5687cbf03e4aaf7c5cd2b0ef59f93d Mon Sep 17 00:00:00 2001 From: imbajin Date: Fri, 8 Dec 2023 20:09:44 +0800 Subject: [PATCH 4/8] sigh2 --- hugegraph-hubble/hubble-be/pom.xml | 5 +++++ hugegraph-hubble/pom.xml | 34 ++++++++++++++++++------------ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index fab251866..a30d56f09 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -144,12 +144,17 @@ + commons-fileupload commons-fileupload + + org.jetbrains.kotlin + kotlin-stdlib + org.jetbrains.kotlin kotlin-stdlib-common diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml index e1147fe35..51ad53d84 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -48,26 +48,32 @@ - - - - - - - - - - - - - - + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + io.netty + netty-bom + ${netty.version} + pom + import + org.springframework.boot spring-boot-dependencies ${springboot.version} pom import + + + org.jetbrains.kotlin + kotlin-stdlib + + org.jetbrains.kotlin From f2b48c97d4a37938f4cf0ded54ae04a9cc568da3 Mon Sep 17 00:00:00 2001 From: imbajin Date: Fri, 8 Dec 2023 20:20:41 +0800 Subject: [PATCH 5/8] Update pom.xml --- hugegraph-hubble/hubble-be/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index a30d56f09..82241098d 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -154,6 +154,7 @@ org.jetbrains.kotlin kotlin-stdlib + 1.6.20 org.jetbrains.kotlin @@ -164,6 +165,12 @@ com.squareup.okhttp3 okhttp ${okhttp.version} + + + kotlin-stdlib + org.jetbrains.kotlin + + From f801df17f86c4f33663b77d8d51e8e0f04fd1b72 Mon Sep 17 00:00:00 2001 From: imbajin Date: Mon, 11 Dec 2023 18:49:36 +0800 Subject: [PATCH 6/8] move to parent now --- hugegraph-hubble/hubble-be/pom.xml | 29 ++++------------------------- hugegraph-hubble/pom.xml | 14 +++++++++++++- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index 82241098d..86320aa23 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -138,10 +138,10 @@ org.jetbrains.kotlin kotlin-stdlib - - - - + + com.squareup.okhttp3 + okhttp + @@ -151,27 +151,6 @@ - - org.jetbrains.kotlin - kotlin-stdlib - 1.6.20 - - - org.jetbrains.kotlin - kotlin-stdlib-common - 1.5.31 - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - kotlin-stdlib - org.jetbrains.kotlin - - - diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml index 51ad53d84..aad548a57 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -47,7 +47,7 @@ - + com.fasterxml.jackson jackson-bom @@ -80,6 +80,18 @@ kotlin-stdlib 1.6.20 + + com.squareup.okhttp3 + okhttp-bom + ${okhttp.version} + pom + import + + + org.jetbrains.kotlin + kotlin-stdlib-common + 1.5.31 + From 3fbc83a645c1da398d291278d6f68805d1e9111d Mon Sep 17 00:00:00 2001 From: imbajin Date: Mon, 11 Dec 2023 19:06:23 +0800 Subject: [PATCH 7/8] move dep --- hugegraph-hubble/hubble-be/pom.xml | 13 ++++++++++++- hugegraph-hubble/pom.xml | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index 86320aa23..f04059f4b 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -33,7 +33,6 @@ 36320 2.1.0 3.3.0 - 4.10.0 @@ -151,6 +150,18 @@ + + com.squareup.okhttp3 + okhttp + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-stdlib-common + diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml index aad548a57..028280e41 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -43,6 +43,7 @@ 2.1.8.RELEASE + 4.10.0 From dbf170d53fcf52c078e84ccd8090153041412a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=AE=87?= <940643974@qq.com> Date: Tue, 12 Dec 2023 10:17:12 +0800 Subject: [PATCH 8/8] fix okhttp version (#554) * fix okhttp version * Update known-dependencies.txt --------- Co-authored-by: Simon Cheung --- hugegraph-dist/scripts/dependency/known-dependencies.txt | 1 - hugegraph-hubble/hubble-be/pom.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt index b47b3aa46..7914115de 100644 --- 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 index f04059f4b..6e81c1691 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -138,7 +138,7 @@ kotlin-stdlib - com.squareup.okhttp3 + com.squareup.okhttp okhttp