Skip to content
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

[Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) #4364

Merged
merged 1 commit into from
Jun 21, 2019

Conversation

htynkn
Copy link
Member

@htynkn htynkn commented Jun 20, 2019

Merge change from release-branch to master branch

…n" module issue (#4356)

* include protobuf-json jar to dubbo
@htynkn
Copy link
Member Author

htynkn commented Jun 20, 2019

Origin PR is #4356
After merged, I realize this PR is for release branch instead of master branch.
Consider we are not allow push to master directly, this PR is to merge change back to master

Copy link
Member

@lovepoem lovepoem left a comment

Choose a reason for hiding this comment

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

lgtm

@lovepoem lovepoem merged commit fa619c9 into master Jun 21, 2019
@codecov-io
Copy link

Codecov Report

Merging #4364 into master will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #4364      +/-   ##
============================================
+ Coverage     62.89%   62.92%   +0.03%     
- Complexity      451      506      +55     
============================================
  Files           769      769              
  Lines         32995    32995              
  Branches       5215     5215              
============================================
+ Hits          20752    20762      +10     
+ Misses         9842     9836       -6     
+ Partials       2401     2397       -4
Impacted Files Coverage Δ Complexity Δ
...ache/dubbo/remoting/p2p/support/AbstractGroup.java 45.45% <0%> (-11.37%) 0% <0%> (ø)
...he/dubbo/registry/multicast/MulticastRegistry.java 67.87% <0%> (-1.81%) 0% <0%> (ø)
.../exchange/support/header/HeaderExchangeServer.java 66.98% <0%> (-0.95%) 0% <0%> (ø)
...ache/dubbo/registry/multiple/MultipleRegistry.java 62.67% <0%> (-0.71%) 20% <0%> (-1%)
...org/apache/dubbo/registry/redis/RedisRegistry.java 48.44% <0%> (+0.28%) 32% <0%> (+1%) ⬆️
...pache/dubbo/remoting/transport/AbstractServer.java 48.95% <0%> (+1.04%) 0% <0%> (ø) ⬇️
...che/dubbo/remoting/transport/mina/MinaChannel.java 55.26% <0%> (+1.31%) 18% <0%> (+1%) ⬆️
...pache/dubbo/registry/support/AbstractRegistry.java 81.6% <0%> (+1.53%) 0% <0%> (ø) ⬇️
...ng/exchange/support/header/HeartbeatTimerTask.java 78.94% <0%> (+5.26%) 0% <0%> (ø) ⬇️
...ng/transport/dispatcher/all/AllChannelHandler.java 57.14% <0%> (+5.71%) 0% <0%> (ø) ⬇️
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60c9d9d...ae22f9e. Read the comment docs.

chickenlj pushed a commit that referenced this pull request Jun 24, 2019
…n" module issue (#4356) (#4364)

* include protobuf-json jar to dubbo
vio-lin pushed a commit to vio-lin/incubator-dubbo that referenced this pull request Jun 25, 2019
rolandhe pushed a commit to rolandhe/dubbo that referenced this pull request Sep 9, 2019
rolandhe pushed a commit to rolandhe/dubbo that referenced this pull request Sep 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants