Skip to content

merge thrift #3977

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
beiwei30 merged 8 commits into from
May 6, 2019
Merged

merge thrift #3977

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d14d560
merge thrift
Leishunyu May 5, 2019
a495b9e
thrift version update
Leishunyu May 5, 2019
5d17a95
test
Leishunyu May 5, 2019
b331582
test success
Leishunyu May 5, 2019
849673d
test success
Leishunyu May 5, 2019
654a529
Merge remote-tracking branch 'upstream/master' into merge-thrift
Leishunyu May 6, 2019
a04a32f
thrift and native thrift
Leishunyu May 6, 2019
7aa6a70
Restore thrift compatibility issues
Leishunyu May 6, 2019
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
2 changes: 1 addition & 1 deletion dubbo-dependencies-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<consul_process_version>2.0.0</consul_process_version>
<xmemcached_version>1.3.6</xmemcached_version>
<cxf_version>3.1.15</cxf_version>
<thrift_version>0.8.0</thrift_version>
<thrift_version>0.11.0</thrift_version>
Comment thread
Leishunyu marked this conversation as resolved.
Outdated
<hessian_version>4.0.38</hessian_version>
<servlet_version>3.1.0</servlet_version>
<jetty_version>9.4.11.v20180605</jetty_version>
Expand Down
30 changes: 3 additions & 27 deletions dubbo-rpc/dubbo-rpc-thrift/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,45 +28,21 @@
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-dubbo</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-netty4</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-config-spring</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-multicast</artifactId>
<version>${project.parent.version}</version>
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${revision}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
31 changes: 0 additions & 31 deletions ...bbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ...pc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ...c-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java
View file
Open in desktop

This file was deleted.

Loading
⚡