Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

fix(common): handle spring-boot2/jersey dependency conflicts #131

Merged
javeme merged 7 commits into from
Apr 20, 2023
Merged

fix(common): handle spring-boot2/jersey dependency conflicts #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
014307b
fix commons dependency conflict
z7658329 Apr 7, 2023
71a4d00
upgrade commons version to 1.0.1
z7658329 Apr 11, 2023
4ddd61f
upgrade common & rpc version to 1.0.1
z7658329 Apr 12, 2023
921c72f
Update pom.xml
imbajin Apr 12, 2023
cb79ce4
upgrade grpc-core version to 1.28.1
z7658329 Apr 20, 2023
df74669
Merge remote-tracking branch 'origin/feat/commons_dependency_conflict…
z7658329 Apr 20, 2023
549cdc7
update grpc version in know-dependencies.txt
z7658329 Apr 20, 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
73 changes: 73 additions & 0 deletions hugegraph-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,32 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>${commons.configuration2.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -110,6 +131,12 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<exclusions>
<exclusion>
<artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -151,6 +178,12 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
<exclusions>
<exclusion>
<artifactId>jakarta.xml.bind-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down Expand Up @@ -182,28 +215,68 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<artifactId>jackson-annotations</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
<exclusion>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
<exclusion>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.hk2.version}</version>
<exclusions>
<exclusion>
<artifactId>javassist</artifactId>
<groupId>org.javassist</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.version}</version>
<exclusions>
<exclusion>
<artifactId>jakarta.activation-api</artifactId>
<groupId>jakarta.activation</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${sun.xml.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>jakarta.xml.bind-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ public class CommonVersion {
public static final String NAME = "hugegraph-common";

// The second parameter of Version.of() is for all-in-one JAR
public static final Version VERSION = Version.of(CommonVersion.class, "1.0.0");
public static final Version VERSION = Version.of(CommonVersion.class, "1.0.1");
}
6 changes: 3 additions & 3 deletions hugegraph-dist/scripts/dependency/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ commons-text-1.9.jar
disruptor-3.3.7.jar
error_prone_annotations-2.3.4.jar
failureaccess-1.0.1.jar
grpc-api-1.28.0.jar
grpc-context-1.28.0.jar
grpc-core-1.28.0.jar
grpc-api-1.28.1.jar
grpc-context-1.28.1.jar
grpc-core-1.28.1.jar
grpc-netty-shaded-1.28.0.jar
grpc-protobuf-1.28.0.jar
grpc-protobuf-lite-1.28.0.jar
Expand Down
9 changes: 9 additions & 0 deletions hugegraph-rpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,17 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>1.28.1</version>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ public class RpcVersion {
public static final String NAME = "hugegraph-rpc";

// The second parameter of Version.of() is for all-in-one JAR
public static final Version VERSION = Version.of(RpcVersion.class, "1.0.0");
public static final Version VERSION = Version.of(RpcVersion.class, "1.0.1");
Copy link
Copy Markdown
Member

@imbajin imbajin Apr 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: we need use one version in one project (currently could keep them..)

}
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
</scm>

<properties>
<revision>1.0.0</revision>
<!-- Note: We need also update the version in CommonVersion.java & RpcVersion.java now -->
<revision>1.0.1</revision>
Copy link
Copy Markdown
Member

@imbajin imbajin Apr 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

search CommonVersion class & also need update it

https://github.com/apache/incubator-hugegraph-commons/blob/82f2a6539f50cf060f02c3d8663444b14050796f/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java#L27

btw, we need a better way to modify the version, at least add a comment in pom for new devs?

@javeme or consider get the version/revision from pom.xml rather than class property? (Or remove common version check if not necessary)

Copy link
Copy Markdown
Contributor

@javeme javeme Apr 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is packaged in a jar, we cannot get the version from the pom.xml, so it fallback to the default version.

Copy link
Copy Markdown
Member

@imbajin imbajin Apr 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is packaged in a jar, we cannot get the version from the pom.xml, so it fallback to the default version.

OK, we could consider these way: (way2 is the easiest)

  1. check if somewhere possible for us to put the version into the jar file (like meta file/info of a jar?)
  2. just leave a comment before revision param in pom file (devs could see the NOTE)
  3. remove the common version check, seems it's not necessary to check it?

Copy link
Copy Markdown
Member Author

@z7658329 z7658329 Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also need to update RpcVersion.java

Copy link
Copy Markdown
Contributor

@javeme javeme Apr 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's keep the status quo until we find a perfect way

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<top.level.dir>${project.basedir}/..</top.level.dir>
<compiler.source>1.8</compiler.source>
Expand All @@ -99,6 +100,7 @@
<commons.configuration2.version>2.8.0</commons.configuration2.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<commons.io.version>2.7</commons.io.version>
<commons.codec.version>1.13</commons.codec.version>
<guava.version>30.0-jre</guava.version>
Expand Down