-
Notifications
You must be signed in to change notification settings - Fork 528
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.
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
refactor(commons): handle sofa-rpc desc type & mark TODO #2666
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
Keep the dependencies for future upgrade refer: <!-- for pom.xml in rpc module -->
<dependencies>
<!-- hugegraph-common -->
<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
<version>${revision}</version>
</dependency>
<!-- sofa rpc -->
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.3.7</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>bolt</artifactId>
<version>1.6.2</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
<version>5.7.6</version>
<exclusions>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-netty4</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
<!-- <exclusion>-->
<!-- <groupId>io.grpc</groupId>-->
<!-- <artifactId>grpc-all</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>jackson-annotations</artifactId>-->
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>jackson-core</artifactId>-->
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>jackson-databind</artifactId>-->
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>netty-all</artifactId>-->
<!-- <groupId>io.netty</groupId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>commons-lang3</artifactId>-->
<!-- <groupId>org.apache.commons</groupId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>protobuf-java</artifactId>-->
<!-- <groupId>com.google.protobuf</groupId>-->
<!-- </exclusion>-->
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>1.28.1</version>
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <artifactId>jackson-core</artifactId>-->
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>guava</artifactId>-->
<!-- <groupId>com.google.guava</groupId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
</dependency>
</dependencies> for <groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-core</artifactId>
<version>${revision}</version>
<exclusions>
<exclusion>
<artifactId>bolt</artifactId>
<groupId>com.alipay.sofa</groupId>
</exclusion>
<!-- <exclusion>-->
<!-- <artifactId>hessian</artifactId>-->
<!-- <groupId>com.alipay.sofa</groupId>-->
<!-- </exclusion>-->
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<artifactId>netty-all</artifactId>
<groupId>io.netty</groupId>
</exclusion>
<exclusion>
<artifactId>sofa-common-tools</artifactId>
<groupId>com.alipay.sofa.common</groupId>
</exclusion>
<exclusion>
<artifactId>hessian</artifactId>
<groupId>com.alipay.sofa</groupId>
</exclusion>
<exclusion>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -41,36 +71,68 @@
<!-- Keep consistent with grpc dependency version (pd/store) -->
<!-- <version>1.47.0</version>-->
<version>1.39.0</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-rpc</artifactId>
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>io.grpc</groupId>-->
<!-- <artifactId>grpc-netty-shaded</artifactId>-->
<!-- </exclusion>-->
<!-- <!– conflict with jraft –>-->
<!-- <exclusion>-->
<!-- <groupId>com.alipay.sofa</groupId>-->
<!-- <artifactId>bolt</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.alipay.sofa.common</groupId>-->
<!-- <artifactId>sofa-common-tools</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.alipay.sofa</groupId>-->
<!-- <artifactId>hessian</artifactId>-->
<!-- </exclusion>-->
<!-- <!– conflict with cassandra-netty/tinkerpop-server –>-->
<!-- <exclusion>-->
<!-- <groupId>io.netty</groupId>-->
<!-- <artifactId>netty-all</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>okio</artifactId>-->
<!-- <groupId>com.squareup.okio</groupId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>bolt</artifactId>
<version>1.6.6</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>netty-all</artifactId>
<groupId>io.netty</groupId>
</exclusion>
<exclusion>
<artifactId>sofa-common-tools</artifactId>
<groupId>com.alipay.sofa.common</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.44.Final</version>
<scope>compile</scope>
</dependency> |
imbajin
changed the title
chore: upgrade sofa-rpc to latest version
refactor(commons): handle sofa-rpc desc type & mark TODO
Oct 23, 2024
dosubot
bot
added
size:L
This PR changes 100-499 lines, ignoring generated files.
dependencies
Incompatible dependencies of package
labels
Oct 23, 2024
VGalaxies
approved these changes
Oct 24, 2024
simon824
approved these changes
Oct 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
dependencies
Incompatible dependencies of package
lgtm
This PR has been approved by a maintainer
size:L
This PR changes 100-499 lines, ignoring generated files.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of the PR
Main Changes
Test it in local env first:
Before (5.7.6)
After (5.12.0)
Does this PR potentially affect the following parts?