Update to version 2.7.1.

4 files changed, 76 insertions, 99 deletions

diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index f4fff3b87a74..90d9c58f3851 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -6,7 +6,7 @@
 # in any of it's log files.  This version was tested under the load and
 # no problems encountered so far.  Thanks.
 PORTNAME=	hadoop
-PORTVERSION=	2.6.0
+PORTVERSION=	2.7.1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/common/stable \
 		LOCAL/demon/:maven \
@@ -37,7 +37,7 @@ CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 USE_LDCONFIG=	yes
-SHEBANG_FILES=	hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh
+SHEBANG_FILES=	hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
 MAKE_ENV+=	HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
 
 OPTIONS_DEFINE=		EXAMPLES
@@ -72,14 +72,14 @@ SUB_LIST=	HDFS_USER="${HDFS_USER}" \
 		HADOOP_RUNDIR="${HADOOP_RUNDIR}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s#/bin/bash#${LOCALBASE}/bin/bash#" ${WRKSRC}/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java ${WRKSRC}/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java ${WRKSRC}/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java ${WRKSRC}/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+	${REINPLACE_CMD} -e "s#/bin/bash#${LOCALBASE}/bin/bash#" ${WRKSRC}/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java ${WRKSRC}/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java ${WRKSRC}/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java ${WRKSRC}/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java ${WRKSRC}/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
 
 do-build:
 	${MKDIR} ${WRKSRC}/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/apache-tomcat-${TOMCAT_VERSION}.tar.gz ${WRKSRC}/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/
 	${MKDIR} ${WRKSRC}/hadoop-common-project/hadoop-kms/downloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/apache-tomcat-${TOMCAT_VERSION}.tar.gz ${WRKSRC}/hadoop-common-project/hadoop-kms/downloads/
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline clean package -Pdist,native -DskipTests -Drequire.snappy -Dsnappy.prefix=${LOCALBASE}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline  package -Pdist,native -DskipTests -Drequire.snappy -Dsnappy.prefix=${LOCALBASE} -Drequire.openssl -Dopenssl.prefix=${OPENSSLBASE}
 
 post-build:
 	${RM} ${HADOOP_DIST}/etc/hadoop/*.cmd
diff --git a/devel/hadoop2/distinfo b/devel/hadoop2/distinfo
index c7972ebcddb4..f3cd68700d2c 100644
--- a/devel/hadoop2/distinfo
+++ b/devel/hadoop2/distinfo
@@ -1,7 +1,7 @@
-SHA256 (hadoop/hadoop-2.6.0-src.tar.gz) = 51a6520b982d7d31813fee14af4d9e46c431cc31b9f71190e81ba229a0233667
-SIZE (hadoop/hadoop-2.6.0-src.tar.gz) = 17523255
-SHA256 (hadoop/FreeBSD-hadoop2-2.6.0-maven-repository.tar.gz) = 03098df8de532d1e07c3ebfd546a412b5b943862243bf71922183fce20b356e6
-SIZE (hadoop/FreeBSD-hadoop2-2.6.0-maven-repository.tar.gz) = 90946275
+SHA256 (hadoop/hadoop-2.7.1-src.tar.gz) = 53f3001c457ad8fdc069e79e6f3370e677bf091df2e758d2b19283818ed4373a
+SIZE (hadoop/hadoop-2.7.1-src.tar.gz) = 18226773
+SHA256 (hadoop/FreeBSD-hadoop2-2.7.1-maven-repository.tar.gz) = 86e5ebf5744c03b51479a3172609cf6f3c618bd7e055ef64534c5b1ba1eba58b
+SIZE (hadoop/FreeBSD-hadoop2-2.7.1-maven-repository.tar.gz) = 89324937
 SHA256 (hadoop/apache-tomcat-6.0.41.tar.gz) = 2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953
 SIZE (hadoop/apache-tomcat-6.0.41.tar.gz) = 7176167
 SHA256 (hadoop/jetty-6.1.14.zip) = ce8a9cf74c7f3a0099438f33b3adcef07d82347d3d67359da2116660e1571187
diff --git a/devel/hadoop2/files/patch-hadoop-common-src-main-native-src-org-apache-hadoop-crypto-random-OpensslSecureRandom.c b/devel/hadoop2/files/patch-hadoop-common-src-main-native-src-org-apache-hadoop-crypto-random-OpensslSecureRandom.c
deleted file mode 100644
index 87a48be0cbbe..000000000000
--- a/devel/hadoop2/files/patch-hadoop-common-src-main-native-src-org-apache-hadoop-crypto-random-OpensslSecureRandom.c
+++ /dev/null
@@ -1,25 +0,0 @@
-See https://issues.apache.org/jira/browse/HADOOP-11638
---- hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c.orig	2015-03-05 16:47:38.000000000 +0300
-+++ hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c	2015-03-05 16:48:34.000000000 +0300
-@@ -27,6 +27,10 @@
- #include <unistd.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
-+
-+#if defined(__FreeBSD__)
-+#include <pthread_np.h>
-+#endif
- #endif
- 
- #ifdef WINDOWS
-@@ -274,7 +278,9 @@ static void pthreads_locking_callback(in
- 
- static unsigned long pthreads_thread_id(void)
- {
--  return (unsigned long)syscall(SYS_gettid);
-+unsigned long thread_id = 0;
-+thread_id = (unsigned long)pthread_getthreadid_np();
-+return thread_id;
- }
- 
- #endif /* UNIX */
diff --git a/devel/hadoop2/pkg-plist b/devel/hadoop2/pkg-plist
index 2ad52e17e487..48dc1883bdf1 100644
--- a/devel/hadoop2/pkg-plist
+++ b/devel/hadoop2/pkg-plist
@@ -44,9 +44,43 @@ sbin/stop-secure-dns.sh
 sbin/stop-yarn.sh
 sbin/yarn-daemon.sh
 sbin/yarn-daemons.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/capacity-scheduler.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/configuration.xsl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/container-executor.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/core-site.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-env.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-metrics.properties
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-metrics2.properties
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-policy.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hdfs-site.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-env.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-log4j.properties
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-signature.secret
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-site.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-acls.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-env.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-log4j.properties
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-site.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/log4j.properties
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mapred-env.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mapred-queues.xml.template
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mapred-site.xml.template
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/slaves
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/ssl-client.xml.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/ssl-server.xml.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/yarn-env.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/yarn-site.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/core-default.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distcp-default.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdfs-default.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpfs-default.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mapred-default.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yarn-default.xml
 %%DATADIR%%/common/hadoop-common-%%PORTVERSION%%-tests.jar
 %%DATADIR%%/common/hadoop-common-%%PORTVERSION%%.jar
 %%DATADIR%%/common/hadoop-nfs-%%PORTVERSION%%.jar
+%%DATADIR%%/common/jdiff/Apache_Hadoop_Common_2.6.0.xml
+%%DATADIR%%/common/jdiff/Null.java
 %%DATADIR%%/common/jdiff/hadoop-core_0.20.0.xml
 %%DATADIR%%/common/jdiff/hadoop-core_0.21.0.xml
 %%DATADIR%%/common/jdiff/hadoop-core_0.22.0.xml
@@ -75,7 +109,6 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/common/lib/commons-compress-1.4.1.jar
 %%DATADIR%%/common/lib/commons-configuration-1.6.jar
 %%DATADIR%%/common/lib/commons-digester-1.8.jar
-%%DATADIR%%/common/lib/commons-el-1.0.jar
 %%DATADIR%%/common/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/common/lib/commons-io-2.4.jar
 %%DATADIR%%/common/lib/commons-lang-2.6.jar
@@ -90,15 +123,13 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/common/lib/hadoop-annotations-%%PORTVERSION%%.jar
 %%DATADIR%%/common/lib/hadoop-auth-%%PORTVERSION%%.jar
 %%DATADIR%%/common/lib/hamcrest-core-1.3.jar
-%%DATADIR%%/common/lib/htrace-core-3.0.4.jar
+%%DATADIR%%/common/lib/htrace-core-3.1.0-incubating.jar
 %%DATADIR%%/common/lib/httpclient-4.2.5.jar
 %%DATADIR%%/common/lib/httpcore-4.2.5.jar
 %%DATADIR%%/common/lib/jackson-core-asl-1.9.13.jar
 %%DATADIR%%/common/lib/jackson-jaxrs-1.9.13.jar
 %%DATADIR%%/common/lib/jackson-mapper-asl-1.9.13.jar
 %%DATADIR%%/common/lib/jackson-xc-1.9.13.jar
-%%DATADIR%%/common/lib/jasper-compiler-5.5.23.jar
-%%DATADIR%%/common/lib/jasper-runtime-5.5.23.jar
 %%DATADIR%%/common/lib/java-xmlbuilder-0.4.jar
 %%DATADIR%%/common/lib/jaxb-api-2.2.2.jar
 %%DATADIR%%/common/lib/jaxb-impl-2.2.3-1.jar
@@ -111,7 +142,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/common/lib/jetty-util-6.1.14.jar
 %%DATADIR%%/common/lib/jsch-0.1.42.jar
 %%DATADIR%%/common/lib/jsp-api-2.1.jar
-%%DATADIR%%/common/lib/jsr305-1.3.9.jar
+%%DATADIR%%/common/lib/jsr305-3.0.0.jar
 %%DATADIR%%/common/lib/junit-4.11.jar
 %%DATADIR%%/common/lib/log4j-1.2.17.jar
 %%DATADIR%%/common/lib/mockito-all-1.8.5.jar
@@ -119,8 +150,8 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/common/lib/paranamer-2.3.jar
 %%DATADIR%%/common/lib/protobuf-java-2.5.0.jar
 %%DATADIR%%/common/lib/servlet-api-2.5.jar
-%%DATADIR%%/common/lib/slf4j-api-1.7.5.jar
-%%DATADIR%%/common/lib/slf4j-log4j12-1.7.5.jar
+%%DATADIR%%/common/lib/slf4j-api-1.7.10.jar
+%%DATADIR%%/common/lib/slf4j-log4j12-1.7.10.jar
 %%DATADIR%%/common/lib/snappy-java-1.0.4.1.jar
 %%DATADIR%%/common/lib/stax-api-1.0-2.jar
 %%DATADIR%%/common/lib/xmlenc-0.52.jar
@@ -130,6 +161,8 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/hdfs/hadoop-hdfs-%%PORTVERSION%%-tests.jar
 %%DATADIR%%/hdfs/hadoop-hdfs-%%PORTVERSION%%.jar
 %%DATADIR%%/hdfs/hadoop-hdfs-nfs-%%PORTVERSION%%.jar
+%%DATADIR%%/hdfs/jdiff/Apache_Hadoop_HDFS_2.6.0.xml
+%%DATADIR%%/hdfs/jdiff/Null.java
 %%DATADIR%%/hdfs/jdiff/hadoop-hdfs_0.20.0.xml
 %%DATADIR%%/hdfs/jdiff/hadoop-hdfs_0.21.0.xml
 %%DATADIR%%/hdfs/jdiff/hadoop-hdfs_0.22.0.xml
@@ -137,23 +170,22 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/hdfs/lib/commons-cli-1.2.jar
 %%DATADIR%%/hdfs/lib/commons-codec-1.4.jar
 %%DATADIR%%/hdfs/lib/commons-daemon-1.0.13.jar
-%%DATADIR%%/hdfs/lib/commons-el-1.0.jar
 %%DATADIR%%/hdfs/lib/commons-io-2.4.jar
 %%DATADIR%%/hdfs/lib/commons-lang-2.6.jar
 %%DATADIR%%/hdfs/lib/commons-logging-1.1.3.jar
 %%DATADIR%%/hdfs/lib/guava-11.0.2.jar
-%%DATADIR%%/hdfs/lib/htrace-core-3.0.4.jar
+%%DATADIR%%/hdfs/lib/htrace-core-3.1.0-incubating.jar
 %%DATADIR%%/hdfs/lib/jackson-core-asl-1.9.13.jar
 %%DATADIR%%/hdfs/lib/jackson-mapper-asl-1.9.13.jar
-%%DATADIR%%/hdfs/lib/jasper-runtime-5.5.23.jar
 %%DATADIR%%/hdfs/lib/jersey-core-1.9.jar
 %%DATADIR%%/hdfs/lib/jersey-server-1.9.jar
 %%DATADIR%%/hdfs/lib/jetty-6.1.14.jar
 %%DATADIR%%/hdfs/lib/jetty-util-6.1.14.jar
-%%DATADIR%%/hdfs/lib/jsp-api-2.1.jar
-%%DATADIR%%/hdfs/lib/jsr305-1.3.9.jar
+%%DATADIR%%/hdfs/lib/jsr305-3.0.0.jar
+%%DATADIR%%/hdfs/lib/leveldbjni-all-1.8.jar
 %%DATADIR%%/hdfs/lib/log4j-1.2.17.jar
 %%DATADIR%%/hdfs/lib/netty-3.6.2.Final.jar
+%%DATADIR%%/hdfs/lib/netty-all-4.0.23.Final.jar
 %%DATADIR%%/hdfs/lib/protobuf-java-2.5.0.jar
 %%DATADIR%%/hdfs/lib/servlet-api-2.5.jar
 %%DATADIR%%/hdfs/lib/xercesImpl-2.9.1.jar
@@ -164,9 +196,6 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/hdfs/webapps/datanode/index.html
 %%DATADIR%%/hdfs/webapps/datanode/robots.txt
 %%DATADIR%%/hdfs/webapps/hdfs/WEB-INF/web.xml
-%%DATADIR%%/hdfs/webapps/hdfs/decommission.xsl
-%%DATADIR%%/hdfs/webapps/hdfs/dfsclusterhealth.xsl
-%%DATADIR%%/hdfs/webapps/hdfs/dfsclusterhealth_utils.xsl
 %%DATADIR%%/hdfs/webapps/hdfs/dfshealth.html
 %%DATADIR%%/hdfs/webapps/hdfs/dfshealth.js
 %%DATADIR%%/hdfs/webapps/hdfs/explorer.html
@@ -174,6 +203,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/hdfs/webapps/hdfs/index.html
 %%DATADIR%%/hdfs/webapps/journal/WEB-INF/web.xml
 %%DATADIR%%/hdfs/webapps/journal/index.html
+%%DATADIR%%/hdfs/webapps/nfs3/WEB-INF/web.xml
 %%DATADIR%%/hdfs/webapps/secondary/WEB-INF/web.xml
 %%DATADIR%%/hdfs/webapps/secondary/index.html
 %%DATADIR%%/hdfs/webapps/secondary/snn.js
@@ -284,6 +314,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSSetReplication.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSSetTimes.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSSetXAttr.class
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSTruncate.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$StatusPair.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$StatusPairs.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations.class
@@ -298,6 +329,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$GroupParam.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$LenParam.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$ModifiedTimeParam.class
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$NewLengthParam.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$OffsetParam.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$OperationParam.class
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$OverwriteParam.class
@@ -404,7 +436,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-auth-%%PORTVERSION%%.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-common-%%PORTVERSION%%.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-hdfs-%%PORTVERSION%%.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/htrace-core-3.0.4.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/htrace-core-3.1.0-incubating.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/httpclient-4.2.5.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/httpcore-4.2.5.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-core-asl-1.9.13.jar
@@ -421,13 +453,15 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jline-0.9.94.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jsch-0.1.42.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/json-simple-1.1.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jsr305-1.3.9.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jsr305-3.0.0.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/leveldbjni-all-1.8.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/log4j-1.2.17.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/netty-3.6.2.Final.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/netty-all-4.0.23.Final.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/paranamer-2.3.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/protobuf-java-2.5.0.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/slf4j-api-1.7.5.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/slf4j-log4j12-1.7.5.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/slf4j-api-1.7.10.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/slf4j-log4j12-1.7.10.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/snappy-java-1.0.4.1.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/xercesImpl-2.9.1.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/xml-apis-1.3.04.jar
@@ -466,7 +500,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/kms/tomcat/conf/context.xml
 %%DATADIR%%/kms/tomcat/conf/logging.properties
 %%DATADIR%%/kms/tomcat/conf/server.xml
-%%DATADIR%%/kms/tomcat/conf/ssl-server.xml
+%%DATADIR%%/kms/tomcat/conf/ssl-server.xml.conf
 %%DATADIR%%/kms/tomcat/conf/tomcat-users.xml
 %%DATADIR%%/kms/tomcat/conf/web.xml
 %%DATADIR%%/kms/tomcat/lib/annotations-api.jar
@@ -522,7 +556,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/hadoop-auth-%%PORTVERSION%%.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/hadoop-common-%%PORTVERSION%%.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/hadoop-kms-%%PORTVERSION%%.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/htrace-core-3.0.4.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/htrace-core-3.1.0-incubating.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/httpclient-4.2.5.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/httpcore-4.2.5.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jackson-core-asl-1.9.13.jar
@@ -538,16 +572,16 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jetty-util-6.1.14.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jline-0.9.94.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jsch-0.1.42.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jsr305-1.3.9.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jul-to-slf4j-1.7.5.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jsr305-3.0.0.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/jul-to-slf4j-1.7.10.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/log4j-1.2.17.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/metrics-core-3.0.1.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/mina-core-2.0.0-M5.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/netty-3.6.2.Final.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/paranamer-2.3.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/protobuf-java-2.5.0.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/slf4j-api-1.7.5.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/slf4j-log4j12-1.7.5.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/slf4j-api-1.7.10.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/slf4j-log4j12-1.7.10.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/snappy-java-1.0.4.1.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/xmlenc-0.52.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/xz-1.0.jar
@@ -594,6 +628,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/asm-3.2.jar
 %%DATADIR%%/tools/lib/avro-1.7.4.jar
 %%DATADIR%%/tools/lib/aws-java-sdk-1.7.4.jar
+%%DATADIR%%/tools/lib/azure-storage-2.0.0.jar
 %%DATADIR%%/tools/lib/commons-beanutils-1.7.0.jar
 %%DATADIR%%/tools/lib/commons-beanutils-core-1.8.0.jar
 %%DATADIR%%/tools/lib/commons-cli-1.2.jar
@@ -602,10 +637,10 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/commons-compress-1.4.1.jar
 %%DATADIR%%/tools/lib/commons-configuration-1.6.jar
 %%DATADIR%%/tools/lib/commons-digester-1.8.jar
-%%DATADIR%%/tools/lib/commons-el-1.0.jar
 %%DATADIR%%/tools/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/tools/lib/commons-io-2.4.jar
 %%DATADIR%%/tools/lib/commons-lang-2.6.jar
+%%DATADIR%%/tools/lib/commons-lang3-3.3.2.jar
 %%DATADIR%%/tools/lib/commons-logging-1.1.3.jar
 %%DATADIR%%/tools/lib/commons-math3-3.1.1.jar
 %%DATADIR%%/tools/lib/commons-net-3.1.jar
@@ -618,6 +653,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/hadoop-archives-%%PORTVERSION%%.jar
 %%DATADIR%%/tools/lib/hadoop-auth-%%PORTVERSION%%.jar
 %%DATADIR%%/tools/lib/hadoop-aws-%%PORTVERSION%%.jar
+%%DATADIR%%/tools/lib/hadoop-azure-%%PORTVERSION%%.jar
 %%DATADIR%%/tools/lib/hadoop-datajoin-%%PORTVERSION%%.jar
 %%DATADIR%%/tools/lib/hadoop-distcp-%%PORTVERSION%%.jar
 %%DATADIR%%/tools/lib/hadoop-extras-%%PORTVERSION%%.jar
@@ -627,7 +663,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/hadoop-sls-%%PORTVERSION%%.jar
 %%DATADIR%%/tools/lib/hadoop-streaming-%%PORTVERSION%%.jar
 %%DATADIR%%/tools/lib/hamcrest-core-1.3.jar
-%%DATADIR%%/tools/lib/htrace-core-3.0.4.jar
+%%DATADIR%%/tools/lib/htrace-core-3.1.0-incubating.jar
 %%DATADIR%%/tools/lib/httpclient-4.2.5.jar
 %%DATADIR%%/tools/lib/httpcore-4.2.5.jar
 %%DATADIR%%/tools/lib/jackson-annotations-2.2.3.jar
@@ -637,8 +673,6 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/jackson-jaxrs-1.9.13.jar
 %%DATADIR%%/tools/lib/jackson-mapper-asl-1.9.13.jar
 %%DATADIR%%/tools/lib/jackson-xc-1.9.13.jar
-%%DATADIR%%/tools/lib/jasper-compiler-5.5.23.jar
-%%DATADIR%%/tools/lib/jasper-runtime-5.5.23.jar
 %%DATADIR%%/tools/lib/java-xmlbuilder-0.4.jar
 %%DATADIR%%/tools/lib/jaxb-api-2.2.2.jar
 %%DATADIR%%/tools/lib/jaxb-impl-2.2.3-1.jar
@@ -649,10 +683,10 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/jettison-1.1.jar
 %%DATADIR%%/tools/lib/jetty-6.1.14.jar
 %%DATADIR%%/tools/lib/jetty-util-6.1.14.jar
-%%DATADIR%%/tools/lib/joda-time-2.7.jar
+%%DATADIR%%/tools/lib/joda-time-2.8.2.jar
 %%DATADIR%%/tools/lib/jsch-0.1.42.jar
 %%DATADIR%%/tools/lib/jsp-api-2.1.jar
-%%DATADIR%%/tools/lib/jsr305-1.3.9.jar
+%%DATADIR%%/tools/lib/jsr305-3.0.0.jar
 %%DATADIR%%/tools/lib/junit-4.11.jar
 %%DATADIR%%/tools/lib/log4j-1.2.17.jar
 %%DATADIR%%/tools/lib/metrics-core-3.0.1.jar
@@ -694,6 +728,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/yarn/hadoop-yarn-server-common-%%PORTVERSION%%.jar
 %%DATADIR%%/yarn/hadoop-yarn-server-nodemanager-%%PORTVERSION%%.jar
 %%DATADIR%%/yarn/hadoop-yarn-server-resourcemanager-%%PORTVERSION%%.jar
+%%DATADIR%%/yarn/hadoop-yarn-server-sharedcachemanager-%%PORTVERSION%%.jar
 %%DATADIR%%/yarn/hadoop-yarn-server-tests-%%PORTVERSION%%.jar
 %%DATADIR%%/yarn/hadoop-yarn-server-web-proxy-%%PORTVERSION%%.jar
 %%DATADIR%%/yarn/lib/activation-1.1.jar
@@ -703,7 +738,6 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/yarn/lib/commons-codec-1.4.jar
 %%DATADIR%%/yarn/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/yarn/lib/commons-compress-1.4.1.jar
-%%DATADIR%%/yarn/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/yarn/lib/commons-io-2.4.jar
 %%DATADIR%%/yarn/lib/commons-lang-2.6.jar
 %%DATADIR%%/yarn/lib/commons-logging-1.1.3.jar
@@ -725,8 +759,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/yarn/lib/jettison-1.1.jar
 %%DATADIR%%/yarn/lib/jetty-6.1.14.jar
 %%DATADIR%%/yarn/lib/jetty-util-6.1.14.jar
-%%DATADIR%%/yarn/lib/jline-0.9.94.jar
-%%DATADIR%%/yarn/lib/jsr305-1.3.9.jar
+%%DATADIR%%/yarn/lib/jsr305-3.0.0.jar
 %%DATADIR%%/yarn/lib/leveldbjni-all-1.8.jar
 %%DATADIR%%/yarn/lib/log4j-1.2.17.jar
 %%DATADIR%%/yarn/lib/netty-3.6.2.Final.jar
@@ -734,40 +767,9 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/yarn/lib/servlet-api-2.5.jar
 %%DATADIR%%/yarn/lib/stax-api-1.0-2.jar
 %%DATADIR%%/yarn/lib/xz-1.0.jar
+%%DATADIR%%/yarn/lib/zookeeper-3.4.6-tests.jar
 %%DATADIR%%/yarn/lib/zookeeper-3.4.6.jar
 %%DATADIR%%/yarn/test/hadoop-yarn-server-tests-%%PORTVERSION%%-tests.jar
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/capacity-scheduler.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/configuration.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/container-executor.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/core-site.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-env.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-metrics.properties
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-metrics2.properties
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hadoop-policy.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/hdfs-site.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-env.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-log4j.properties
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-signature.secret
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/httpfs-site.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-acls.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-env.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-log4j.properties
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/kms-site.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/log4j.properties
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mapred-env.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mapred-queues.xml.template
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mapred-site.xml.template
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/slaves
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/ssl-client.xml.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/ssl-server.xml.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/yarn-env.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/yarn-site.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/core-default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distcp-default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdfs-default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpfs-default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mapred-default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yarn-default.xml
 @dir %%ETCDIR%%
 @dir(,%%HADOOP_GROUP%%,0775) %%HADOOP_LOGDIR%%
 @dir(,%%HADOOP_GROUP%%,0775) %%HADOOP_RUNDIR%%