3 files changed, 27 insertions, 28 deletions

diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index ea39b130d209..722c41175dc6 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -6,8 +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.7.1
-PORTREVISION=	1
+PORTVERSION=	2.7.2
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/common/stable \
 		LOCAL/demon/:maven \
@@ -44,7 +43,7 @@ MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES
 
-TOMCAT_VERSION=	6.0.41
+TOMCAT_VERSION=	6.0.44
 HADOOP_DIST=	${WRKSRC}/hadoop-dist/target/hadoop-${PORTVERSION}
 
 HADOOP_LOGDIR=	/var/log/hadoop
@@ -80,7 +79,7 @@ do-build:
 	${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  package -Pdist,native -DskipTests -Drequire.snappy -Dsnappy.prefix=${LOCALBASE} -Drequire.openssl
+	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
 
 post-build:
 	${RM} ${HADOOP_DIST}/etc/hadoop/*.cmd
diff --git a/devel/hadoop2/distinfo b/devel/hadoop2/distinfo
index f3cd68700d2c..c7864bfa91cd 100644
--- a/devel/hadoop2/distinfo
+++ b/devel/hadoop2/distinfo
@@ -1,8 +1,8 @@
-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/hadoop-2.7.2-src.tar.gz) = 7d48e61b5464a76543fecf5655d06215cf8674d248b28bc74f613bc8aa047d33
+SIZE (hadoop/hadoop-2.7.2-src.tar.gz) = 18290860
+SHA256 (hadoop/FreeBSD-hadoop2-2.7.2-maven-repository.tar.gz) = 602023843945752412a74060a50402abc83a38c565728db5c8b7d191cdd56af2
+SIZE (hadoop/FreeBSD-hadoop2-2.7.2-maven-repository.tar.gz) = 89865575
+SHA256 (hadoop/apache-tomcat-6.0.44.tar.gz) = aab792322e75c6502675120933cbc519cfb59ac8d192f4fa103371a335708224
+SIZE (hadoop/apache-tomcat-6.0.44.tar.gz) = 7065218
 SHA256 (hadoop/jetty-6.1.14.zip) = ce8a9cf74c7f3a0099438f33b3adcef07d82347d3d67359da2116660e1571187
 SIZE (hadoop/jetty-6.1.14.zip) = 24903728
diff --git a/devel/hadoop2/pkg-plist b/devel/hadoop2/pkg-plist
index 48dc1883bdf1..98ee762636cb 100644
--- a/devel/hadoop2/pkg-plist
+++ b/devel/hadoop2/pkg-plist
@@ -105,7 +105,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/common/lib/commons-beanutils-core-1.8.0.jar
 %%DATADIR%%/common/lib/commons-cli-1.2.jar
 %%DATADIR%%/common/lib/commons-codec-1.4.jar
-%%DATADIR%%/common/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/common/lib/commons-collections-3.2.2.jar
 %%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
@@ -115,9 +115,9 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/common/lib/commons-logging-1.1.3.jar
 %%DATADIR%%/common/lib/commons-math3-3.1.1.jar
 %%DATADIR%%/common/lib/commons-net-3.1.jar
-%%DATADIR%%/common/lib/curator-client-%%PORTVERSION%%.jar
-%%DATADIR%%/common/lib/curator-framework-%%PORTVERSION%%.jar
-%%DATADIR%%/common/lib/curator-recipes-%%PORTVERSION%%.jar
+%%DATADIR%%/common/lib/curator-client-2.7.1.jar
+%%DATADIR%%/common/lib/curator-framework-2.7.1.jar
+%%DATADIR%%/common/lib/curator-recipes-2.7.1.jar
 %%DATADIR%%/common/lib/gson-2.2.4.jar
 %%DATADIR%%/common/lib/guava-11.0.2.jar
 %%DATADIR%%/common/lib/hadoop-annotations-%%PORTVERSION%%.jar
@@ -417,7 +417,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-beanutils-core-1.8.0.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-cli-1.2.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-codec-1.4.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-collections-3.2.2.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-compress-1.4.1.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-configuration-1.6.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-daemon-1.0.13.jar
@@ -427,9 +427,9 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-logging-1.1.3.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-math3-3.1.1.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-net-3.1.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/curator-client-%%PORTVERSION%%.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/curator-framework-%%PORTVERSION%%.jar
-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/curator-recipes-%%PORTVERSION%%.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/curator-client-2.7.1.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/curator-framework-2.7.1.jar
+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/curator-recipes-2.7.1.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/gson-2.2.4.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/guava-11.0.2.jar
 %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-annotations-%%PORTVERSION%%.jar
@@ -537,7 +537,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-beanutils-core-1.8.0.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-cli-1.2.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-codec-1.4.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-collections-3.2.2.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-compress-1.4.1.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-configuration-1.6.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-digester-1.8.jar
@@ -546,9 +546,9 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-logging-1.1.3.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-math3-3.1.1.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/commons-net-3.1.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/curator-client-%%PORTVERSION%%.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/curator-framework-%%PORTVERSION%%.jar
-%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/curator-recipes-%%PORTVERSION%%.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/curator-client-2.7.1.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/curator-framework-2.7.1.jar
+%%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/curator-recipes-2.7.1.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/ehcache-core-2.4.4.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/gson-2.2.4.jar
 %%DATADIR%%/kms/tomcat/webapps/kms/WEB-INF/lib/guava-11.0.2.jar
@@ -633,7 +633,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/commons-beanutils-core-1.8.0.jar
 %%DATADIR%%/tools/lib/commons-cli-1.2.jar
 %%DATADIR%%/tools/lib/commons-codec-1.4.jar
-%%DATADIR%%/tools/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/tools/lib/commons-collections-3.2.2.jar
 %%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
@@ -644,9 +644,9 @@ sbin/yarn-daemons.sh
 %%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
-%%DATADIR%%/tools/lib/curator-client-%%PORTVERSION%%.jar
-%%DATADIR%%/tools/lib/curator-framework-%%PORTVERSION%%.jar
-%%DATADIR%%/tools/lib/curator-recipes-%%PORTVERSION%%.jar
+%%DATADIR%%/tools/lib/curator-client-2.7.1.jar
+%%DATADIR%%/tools/lib/curator-framework-2.7.1.jar
+%%DATADIR%%/tools/lib/curator-recipes-2.7.1.jar
 %%DATADIR%%/tools/lib/gson-2.2.4.jar
 %%DATADIR%%/tools/lib/guava-11.0.2.jar
 %%DATADIR%%/tools/lib/hadoop-ant-%%PORTVERSION%%.jar
@@ -683,7 +683,7 @@ 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.8.2.jar
+%%DATADIR%%/tools/lib/joda-time-2.9.2.jar
 %%DATADIR%%/tools/lib/jsch-0.1.42.jar
 %%DATADIR%%/tools/lib/jsp-api-2.1.jar
 %%DATADIR%%/tools/lib/jsr305-3.0.0.jar
@@ -736,7 +736,7 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/yarn/lib/asm-3.2.jar
 %%DATADIR%%/yarn/lib/commons-cli-1.2.jar
 %%DATADIR%%/yarn/lib/commons-codec-1.4.jar
-%%DATADIR%%/yarn/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/yarn/lib/commons-collections-3.2.2.jar
 %%DATADIR%%/yarn/lib/commons-compress-1.4.1.jar
 %%DATADIR%%/yarn/lib/commons-io-2.4.jar
 %%DATADIR%%/yarn/lib/commons-lang-2.6.jar