melissayou opened a new pull request, #5067:
URL: https://github.com/apache/hadoop/pull/5067
<!--
Thanks for sending a pull request!
1. If this is your first time, please read our contributor guidelines:
https://cwiki.apache.org/confluence/display/HADOOP/How+To+Contribute
2. Make sure your PR title starts with JIRA issue id, e.g.,
'HADOOP-17799. Your PR title ...'.
-->
### Description of PR
It is a cherry-pick from commit `ccfa072` and `23e2a0b` in trunk to upgrade
zookeeper and curator. To port `ccfa072`, we need to port `23e2a0b` to remove
deprecated
[classes](https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5047/4/artifact/out/results-compile-javac-root.txt)
in curator 5.0.
For `ccfa072`, it is a clean cherry pick.
For `23e2a0b`, there are some nested changes that is in trunk but not
branch-3.3, specifically
> isTokenWatcherEnabled = conf.getBoolean(ZK_DTSM_TOKEN_WATCHER_ENABLED,
> ZK_DTSM_TOKEN_WATCHER_ENABLED_DEFAULT);
It was added from
[HDFS-15383](https://issues.apache.org/jira/browse/HDFS-15383). It's in trunk
but not 3.3. Because 3.3 did not introduce HDFS-15383 feature, I removed line
`if (isTokenWatcherEnabled){}`. It should not impact anything.
### How was this patch tested?
mvn clean install -Pdist -Dtar -DskipTests -Dmaven.javadoc.skip builds
successfully
### For code changes:
- [X] Does the title or this PR starts with the corresponding JIRA issue id
(e.g. 'HADOOP-17799. Your PR title ...')?
- [ ] Object storage: have the integration tests been executed and the
endpoint declared according to the connector-specific documentation?
- [ ] If adding new dependencies to the code, are these dependencies
licensed in a way that is compatible for inclusion under [ASF
2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [X] If applicable, have you updated the `LICENSE`, `LICENSE-binary`,
`NOTICE-binary` files?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
