This is an automated email from the ASF dual-hosted git repository. jin pushed a commit to branch fix-kotlin in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git
commit e667183efa2827cabcf87c9d09602e92a30c81cb Author: imbajin <[email protected]> AuthorDate: Fri Dec 8 19:03:20 2023 +0800 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 301c6c34..d911165e 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -139,46 +139,29 @@ <artifactId>kotlin-stdlib</artifactId> </exclusion> <exclusion> - <groupId>com.squareup.okhttp</groupId> + <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp</artifactId> </exclusion> </exclusions> </dependency> - - <!--overwrite okhttp and kotlin for version conflict--> - <dependency> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>okhttp</artifactId> - </dependency> <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib</artifactId> - <version>1.6.20</version> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> </dependency> + + <!--overwrite okhttp and kotlin for version conflict--> <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> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp.version}</version> </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 +176,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 index 5af407ab..42ebd2a1 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -47,20 +47,7 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>com.fasterxml.jackson</groupId> - <artifactId>jackson-bom</artifactId> - <version>${jackson.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-bom</artifactId> - <version>${netty.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <!-- Note: Don't put dependencies here unless we ensure need them --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> @@ -68,6 +55,11 @@ <type>pom</type> <scope>import</scope> </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + <version>1.6.20</version> + </dependency> </dependencies> </dependencyManagement>
