BIGTOP-2771. ambari: build failed due to using third-party ConcurrentHashMap instead of the standard one unnecessarily
Closes #212 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/750efb5f Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/750efb5f Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/750efb5f Branch: refs/heads/branch-1.2 Commit: 750efb5fa96043d5ecccc171380d1e4b65cbf5ab Parents: 5874ba5 Author: Kengo Seki <[email protected]> Authored: Mon May 22 19:40:03 2017 -0400 Committer: Evans Ye <[email protected]> Committed: Sat Jul 1 12:52:54 2017 +0000 ---------------------------------------------------------------------- .../ambari/patch2-AMBARI-ConcurrentHashMap.diff | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/750efb5f/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff b/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff new file mode 100644 index 0000000..bf0980e --- /dev/null +++ b/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff @@ -0,0 +1,19 @@ +diff -ruaN apache-ambari-2.5.0-src.orig/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java apache-ambari-2.5.0-src/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java +--- apache-ambari-2.5.0-src.orig/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java 2017-03-27 20:46:35.000000000 -0400 ++++ apache-ambari-2.5.0-src/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java 2017-05-21 23:48:37.676372818 -0400 +@@ -25,6 +25,7 @@ + import java.util.Map; + import java.util.Map.Entry; + import java.util.Set; ++import java.util.concurrent.ConcurrentHashMap; + import java.util.concurrent.ConcurrentMap; + import java.util.concurrent.locks.Lock; + import java.util.concurrent.locks.ReadWriteLock; +@@ -77,7 +78,6 @@ + import org.apache.ambari.server.state.fsm.StateMachine; + import org.apache.ambari.server.state.fsm.StateMachineFactory; + import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper; +-import org.jboss.netty.util.internal.ConcurrentHashMap; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; +
