Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coderzc merged 8 commits into from
Dec 12, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e667183
fix(hubble): parent override children dep version
imbajin Dec 8, 2023
e46f5d4
Update pom.xml
imbajin Dec 8, 2023
a71201e
sign
imbajin Dec 8, 2023
4e75a72
sigh2
imbajin Dec 8, 2023
f2b48c9
Update pom.xml
imbajin Dec 8, 2023
f801df1
move to parent now
imbajin Dec 11, 2023
3fbc83a
move dep
imbajin Dec 11, 2023
dbf170d
fix okhttp version (#554)
zhenyuT Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hugegraph-dist/scripts/dependency/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 5 additions & 35 deletions hugegraph-hubble/hubble-be/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
25 changes: 25 additions & 0 deletions hugegraph-hubble/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down