[SCB-1139] update vertx version from 3.5.3 to 3.6.2#1084
Merged
wujimin merged 5 commits intoapache:masterfrom Feb 18, 2019
Merged
[SCB-1139] update vertx version from 3.5.3 to 3.6.2#1084wujimin merged 5 commits intoapache:masterfrom
wujimin merged 5 commits intoapache:masterfrom
Conversation
jeho0815
force-pushed
the
Branch_master_SCB-1139
branch
from
61a682c to
23d0fda
Compare
1、update netty to 4.1.28 ncnative to 2.0.14.Final jackson 2.9.8 2、vertximpl and ConnectionBase(just for test) does not have an public construtor, so add the VertxImpl to resolve first, later will be removed 3、DefaultVertxMetrics does not have the vertx parameter, so add an setter method 4、delete the apache#961, jackson has fixed the promblem by FasterXML/jackson-core@b6c54cf
jeho0815
force-pushed
the
Branch_master_SCB-1139
branch
from
23d0fda to
f7f0db0
Compare
wujimin
reviewed
Feb 3, 2019
Contributor
wujimin
left a comment
wujimin
left a comment
There was a problem hiding this comment.
there are many errors in log, so CI failed
| @@ -0,0 +1,398 @@ | |||
| /* | |||
Contributor
There was a problem hiding this comment.
must use vertx LICENSE
and why copy this file?
Contributor
Author
There was a problem hiding this comment.
we mock some methods of ConnectionBase have changed to final, but mockito's the old version can't mock the final method, so copy this file.
liubao68
reviewed
Feb 11, 2019
| String configCenter = memberDiscovery.getConfigServer(); | ||
| IpPort ipPort = NetUtils.parseIpPortFromURI(configCenter); | ||
| clientMgr.findThreadBindClientPool().runOnContext(client -> { | ||
| @SuppressWarnings("deprecation") |
Contributor
There was a problem hiding this comment.
Do not use deprecad api if possible.
Contributor
Author
There was a problem hiding this comment.
vertx 3.6.3 statement the interface is deprecated, but has not provider a new interface to replace, so we have to add the annotation to paas the CI buiding
jeho0815
force-pushed
the
Branch_master_SCB-1139
branch
from
729ac37 to
44dedb1
Compare
jeho0815
force-pushed
the
Branch_master_SCB-1139
branch
from
44dedb1 to
2dc7539
Compare
wujimin
reviewed
Feb 16, 2019
LICENSE
Outdated
|
|
||
| ================================================================ | ||
| For foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/PumpImplEx.java | ||
| For transports/transport-rest/transport-rest-client/src/test/java/io/vertx/core/net/impl/ConnectionBase.java |
Contributor
There was a problem hiding this comment.
no need to declare ConnectionBase.java any more
wujimin
reviewed
Feb 16, 2019
pom.xml
Outdated
| <exclude>**/target/**</exclude> | ||
| <!-- Skip the source files which are forked from vertx --> | ||
| <exclude>**/io/vertx/ext/web/impl/MimeTypesUtils.java</exclude> | ||
| <exclude>**/io/vertx/core/net/impl/ConnectionBase.java</exclude> |
Contributor
There was a problem hiding this comment.
no need to declare ConnectionBase.java any more
wujimin
approved these changes
Feb 18, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
1、update netty to 4.1.28 ncnative to 2.0.14.Final jackson 2.9.8
2、vertximpl and ConnectionBase(just for test) does not have an public construtor, so add the VertxImpl to resolve first, later will be removed
3、DefaultVertxMetrics does not have the vertx parameter, so add an setter method
Follow this checklist to help us incorporate your contribution quickly and easily:
[SCB-XXX] Fixes bug in ApproximateQuantiles, where you replaceSCB-XXXwith the appropriate JIRA issue.mvn clean installto make sure basic checks pass. A more thorough check will be performed on your pull request automatically.