diff --git a/commons-server-cluster/pom.xml b/commons-server-cluster/pom.xml
index 542ab45f478a..e7292ed86cb7 100644
--- a/commons-server-cluster/pom.xml
+++ b/commons-server-cluster/pom.xml
@@ -36,13 +36,6 @@
${log4j2-jdk8.version}
-
-
- curator-patch-repo
- file://${project.basedir}/libs
-
-
-
org.apache.zookeeper
diff --git a/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom b/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom
new file mode 100644
index 000000000000..53f2356f9d6b
--- /dev/null
+++ b/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom
@@ -0,0 +1,910 @@
+
+
+
+ 4.0.0
+
+
+ org.apache
+ apache
+ 21
+
+
+ org.apache.curator
+ apache-curator
+ 4.2.1
+ pom
+
+ Apache Curator
+
+ Curator is a set of Java libraries that make using Apache ZooKeeper much easier.
+
+ http://curator.apache.org
+ 2011
+
+
+
+ The Apache Software License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ The Apache Software Foundation
+ http://www.apache.org/
+
+
+
+ UTF-8
+ UTF-8
+ UTF-8
+
+ 1.8
+
+
+ 3.5.4-beta
+ 4.1.0
+ 3.0.1
+ 1.8
+ 1.9.0
+ 3.24.1-GA
+ 2.2
+ 1.9.13
+ 2.9.8
+
+ 1.19.4
+ 1.1.1
+
+ 2.2.11
+ 1.1.1
+ 6.1.26
+ 1.0.2
+
+ 2.3.5.Final
+ 27.0.1-jre
+ 1.0
+ 1.0.1
+ 6.14.3
+ 0.23.1
+ 1.3.7
+ 3.2.1
+ 1.7.25
+ 2.8
+
+
+
+
+
+
+
+
+
+
+
+
+ https://github.com/apache/curator.git
+ scm:git:https://gitbox.apache.org/repos/asf/curator.git
+ scm:git:https://gitbox.apache.org/repos/asf/curator.git
+ apache-curator-4.2.0
+
+
+
+ JIRA
+ http://issues.apache.org/jira/browse/CURATOR
+
+
+
+ Jenkins
+ https://builds.apache.org/job/Curator/
+
+
+ mail
+ true
+ true
+ false
+ false
+
+ dev@curator.apache.org
+
+
+
+
+
+
+
+ apache.website.svnpub
+ scm:svn:https://svn.apache.org/repos/asf/curator/site/trunk
+
+
+
+
+
+ Users
+ user@curator.apache.org
+ user-subscribe@curator.apache.org
+ user-unsubscribe@curator.apache.org
+ http://mail-archives.apache.org/mod_mbox/curator-user/
+
+
+ Development
+ dev@curator.apache.org
+ dev-subscribe@curator.apache.org
+ dev-unsubscribe@curator.apache.org
+ http://mail-archives.apache.org/mod_mbox/curator-dev/
+
+
+ Commits
+ commits@curator.apache.org
+ commits-subscribe@curator.apache.org
+ commits-unsubscribe@curator.apache.org
+ http://mail-archives.apache.org/mod_mbox/curator-commits/
+
+
+
+
+
+ randgalt
+ Jordan Zimmerman
+ randgalt@apache.org
+ -5
+
+ Committer
+ PMC Chair
+
+ https://people.apache.org/~randgalt
+
+
+
+ zarfide
+ Jay Zarfoss
+ zarfide@apache.org
+ -8
+
+ Committer
+ PMC Member
+
+ http://www.linkedin.com/pub/jay-zarfoss/34/56/a19
+
+
+
+ cheddar
+ Eric Tschetter
+ cheddar@apache.org
+ -6
+
+ Committer
+ PMC Member
+ ChedHeader
+
+
+
+ iocanel
+ Ioannis Canellos
+ iocanel@apache.org
+ +2
+
+ Committer
+ PMC Member
+
+ http://iocanel.blogspot.com
+
+
+
+ cammckenzie
+ Cameron McKenzie
+ cammckenzie@apache.org
+ +10
+
+ Committer
+ PMC Member
+
+ https://people.apache.org/~cammckenzie
+
+
+
+ dragonsinth
+ Scott Blum
+ dragonsinth@apache.org
+ -5
+
+ Committer
+ PMC Member
+
+ http://github.com/dragonsinth
+
+
+
+ mdrob
+ Mike Drob
+ mdrob@apache.org
+ -6
+
+ Committer
+ PMC Member
+
+ http://people.apache.org/~mdrob
+
+
+
+ Patrick Hunt
+ phunt1@gmail.com
+
+ PMC Member
+
+ -8
+ http://www.linkedin.com/pub/patrick-hunt/2/5b2/24a
+
+
+
+ Mahadev Konar
+ mahadev@apache.org
+
+ PMC Member
+
+ -8
+ http://www.linkedin.com/in/mahadevkonar
+
+
+
+ Luciano Resende
+ lresende@apache.org
+
+ PMC Member
+
+ -8
+ https://people.apache.org/~lresende
+
+
+
+ Enis Söztutar
+ enis@apache.org
+
+ PMC Member
+
+ -8
+ https://people.apache.org/~enis
+
+
+
+ Fangmin Lyu
+ fangmin@apache.org
+
+ Committer
+ PMC Member
+
+ -8
+ https://people.apache.org/~fangmin
+
+
+
+
+ curator-client
+ curator-test
+ curator-framework
+ curator-recipes
+ curator-examples
+ curator-x-discovery
+ curator-x-discovery-server
+ curator-x-async
+ curator-test-zk34
+
+
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j-version}
+
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${slf4j-version}
+
+
+
+ org.mockito
+ mockito-core
+ 1.9.5
+
+
+
+ org.apache.curator
+ curator-client
+ ${project.version}
+
+
+
+ org.apache.curator
+ curator-framework
+ ${project.version}
+
+
+
+ org.apache.curator
+ curator-framework
+ test-jar
+ ${project.version}
+
+
+
+ org.apache.curator
+ curator-recipes
+ ${project.version}
+
+
+
+ org.apache.curator
+ curator-recipes
+ ${project.version}
+ test-jar
+
+
+
+ org.apache.curator
+ curator-test
+ ${project.version}
+
+
+
+ org.apache.curator
+ curator-x-discovery
+ ${project.version}
+
+
+
+ org.apache.curator
+ curator-x-discovery-server
+ ${project.version}
+
+
+
+ org.apache.curator
+ curator-x-async
+ ${project.version}
+
+
+
+ org.apache.commons
+ commons-math
+ ${commons-math-version}
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${jackson-version}
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson-version}
+
+
+
+ com.sun.jersey
+ jersey-server
+ ${jersey-version}
+
+
+
+ com.sun.jersey
+ jersey-servlet
+ ${jersey-version}
+
+
+
+ com.sun.jersey
+ jersey-client
+ ${jersey-version}
+
+
+
+ com.sun.jersey
+ jersey-core
+ ${jersey-version}
+
+
+
+ javax.ws.rs
+ jsr311-api
+ ${jsr311-api-version}
+
+
+
+ javax.xml.bind
+ jaxb-api
+ ${jaxb-version}
+
+
+
+ com.sun.xml.bind
+ jaxb-core
+ ${jaxb-version}
+
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ ${jaxb-version}
+
+
+
+ javax.activation
+ activation
+ ${javax-activation-version}
+
+
+
+ org.mortbay.jetty
+ jetty
+ ${jetty-version}
+
+
+
+ net.sf.scannotation
+ scannotation
+ ${scannotation-version}
+
+
+
+ org.jboss.resteasy
+ resteasy-jaxrs
+ ${resteasy-jaxrs-version}
+
+
+ org.scannotation
+ scannotation
+
+
+
+
+
+ org.apache.zookeeper
+ zookeeper
+ ${zookeeper-version}
+
+
+ com.sun.jmx
+ jmxri
+
+
+ com.sun.jdmk
+ jmxtools
+
+
+ javax.jms
+ jms
+
+
+ junit
+ junit
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
+
+ com.google.guava
+ guava
+ ${guava-version}
+
+
+
+ com.google.guava
+ listenablefuture
+ ${guava-listenablefuture-version}
+
+
+
+ com.google.guava
+ failureaccess
+ ${guava-failureaccess-version}
+
+
+
+ org.testng
+ testng
+ ${testng-version}
+
+
+
+ com.facebook.swift
+ swift-codec
+ ${swift-version}
+
+
+
+ com.facebook.swift
+ swift-service
+ ${swift-version}
+
+
+
+ io.dropwizard
+ dropwizard-configuration
+ ${dropwizard-version}
+
+
+
+ io.dropwizard
+ dropwizard-logging
+ ${dropwizard-version}
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-project-info-reports-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ ${maven-javadoc-plugin-version}
+
+ true
+
+ -J-Xmx1g
+
+ false
+
+
+
+
+ org.codehaus.mojo
+ clirr-maven-plugin
+
+
+ org/apache/curator/**
+
+
+
+
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ ${maven-bundle-plugin-version}
+
+
+
+ com.mycila.maven-license-plugin
+ maven-license-plugin
+ ${maven-license-plugin-version}
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+
+ true
+ ${project.artifactId}-${project.version}
+ false
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ ${maven-shade-plugin-version}
+
+
+
+ org.codehaus.mojo
+ clirr-maven-plugin
+ ${clirr-maven-plugin-version}
+
+
+
+
+
+
+ ${basedir}
+ META-INF
+
+ DISCLAIMER
+ LICENSE
+ NOTICE
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-install-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ ${jdk-version}
+ ${jdk-version}
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+ true
+
+
+ ${project.name}
+ ${project.artifactId}
+ ${osgi.export.package}
+ ${osgi.import.package}
+ ${osgi.dynamic.import}
+ ${osgi.private.package}
+ ${osgi.require.bundle}
+ ${osgi.activator}
+ ${osgi.export.service}
+
+
+ jar
+ war
+ bundle
+
+ true
+
+
+
+ bundle-manifest
+ process-classes
+
+ manifest
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ 1
+ false
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ -J-Xmx1g
+
+ false
+
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+
+ en
+ true
+
+
+
+ org.apache.maven.doxia
+ doxia-module-confluence
+ ${doxia-module-confluence-version}
+
+
+
+
+ site
+
+ site
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-scm-publish-plugin
+ false
+
+ Curator website deployment
+
+ ${curator-website-checkout-path}
+
+
+
+ scm-publish
+ site-deploy
+
+ publish-scm
+
+
+
+
+
+
+ com.mycila.maven-license-plugin
+ maven-license-plugin
+
+
+
+ **/*.confluence
+ **/help.txt
+ **/*.rdf
+ **/.gitignore
+ **/*.thrift
+ **/*.json
+ **/.idea/**
+ **/DISCLAIMER
+ **/DEPENDENCIES
+ **/KEYS
+ **/LICENSE
+ **/NOTICE
+ **/README
+ **/CHANGES
+ **/RELEASE-NOTES
+ **/generated/**
+
+ true
+
+
+
+ license
+ validate
+
+ check
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+
+ -DskipTests
+ forked-path
+
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+
+ 0
+ false
+
+ **/*.confluence
+ **/*.rdf
+ **/help.txt
+ **/.gitignore
+ **/*.thrift
+ **/*.json
+ **/.idea/**
+ **/DISCLAIMER
+ **/DEPENDENCIES
+ **/KEYS
+ **/LICENSE
+ **/NOTICE
+ **/README
+ **/CHANGES
+ **/RELEASE-NOTES
+ **/generated/**
+
+
+
+
+
+ org.codehaus.mojo
+ clirr-maven-plugin
+
+ false
+ true
+
+ org/apache/curator/**
+
+
+
+
+ compile
+
+ check
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
+ apache-curator-guava-shader
+
+ shade
+
+ package
+
+ false
+
+
+ com.google
+ org.apache.curator.shaded.com.google
+
+ com.google.common.base.Function
+ com.google.common.base.Predicate
+ com.google.common.reflect.TypeToken
+
+
+
+
+
+ ${project.groupId}:${project.artifactId}
+
+
+
+
+ com.google.guava:guava
+
+ META-INF/**
+
+
+
+ com.google.guava:listenablefuture
+
+ META-INF/**
+
+
+
+ com.google.guava:failureaccess
+
+ META-INF/**
+
+
+
+
+
+
+
+
+
+
diff --git a/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom.md5 b/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom.md5
new file mode 100644
index 000000000000..1589b955208a
--- /dev/null
+++ b/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom.md5
@@ -0,0 +1 @@
+d4389d7f9401536e9ff8d54e264efaa2
\ No newline at end of file
diff --git a/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom.sha1 b/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom.sha1
new file mode 100644
index 000000000000..396ff933b097
--- /dev/null
+++ b/libs/org/apache/curator/apache-curator/4.2.1/apache-curator-4.2.1.pom.sha1
@@ -0,0 +1 @@
+0591f47162b7b0233eefdec724d748882784e66c
\ No newline at end of file
diff --git a/commons-server-cluster/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar
similarity index 85%
rename from commons-server-cluster/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar
rename to libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar
index cc8e90f9c39a..e6eaf4343d96 100644
Binary files a/commons-server-cluster/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar and b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar differ
diff --git a/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar.md5 b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar.md5
new file mode 100644
index 000000000000..06642e851d7c
--- /dev/null
+++ b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar.md5
@@ -0,0 +1 @@
+b77fd5573f6d270a6e20935e9d1c98ba
\ No newline at end of file
diff --git a/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar.sha1 b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar.sha1
new file mode 100644
index 000000000000..ccdd8bc06a39
--- /dev/null
+++ b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.jar.sha1
@@ -0,0 +1 @@
+c39035c8e8d769bf3db192dc2a9e6ebdb0bca680
\ No newline at end of file
diff --git a/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom
new file mode 100644
index 000000000000..82e7d424779e
--- /dev/null
+++ b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom
@@ -0,0 +1,105 @@
+
+
+
+
+ 4.0.0
+
+
+ org.apache.curator
+ apache-curator
+ 4.2.1
+
+
+ curator-framework
+ 4.2.1
+ bundle
+
+ Curator Framework
+ High-level API that greatly simplifies using ZooKeeper.
+ 2011
+
+
+
+ *
+
+
+ org.apache.curator.framework*;version="${project.version}";-noimport:=true
+
+
+
+
+
+ org.apache.curator
+ curator-client
+
+
+
+ org.apache.curator
+ curator-test
+ test
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ provided
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ provided
+
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-yaml
+ ${jackson-version}
+ test
+
+
+
+ org.testng
+ testng
+ test
+
+
+
+ org.slf4j
+ slf4j-log4j12
+ test
+
+
+
+
+
+
+ maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
+
diff --git a/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom.md5 b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom.md5
new file mode 100644
index 000000000000..c3ba9e0a835e
--- /dev/null
+++ b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom.md5
@@ -0,0 +1 @@
+95eaba93230b6590249fc03763d3380f
\ No newline at end of file
diff --git a/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom.sha1 b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom.sha1
new file mode 100644
index 000000000000..f8756958492a
--- /dev/null
+++ b/libs/org/apache/curator/curator-framework/4.2.1/curator-framework-4.2.1.pom.sha1
@@ -0,0 +1 @@
+a190715a83aab2bf9a502c6d5e7514556ff70207
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3642a8292273..7e2b462529af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,11 @@
http://repo.spring.io/libs-release
-->
+
+
+ curator-patch-repo
+ file://${maven.multiModuleProjectDirectory}/libs
+