Update for hadoop 2.7.1

3 files changed, 9 insertions, 8 deletions

diff --git a/devel/oozie/Makefile b/devel/oozie/Makefile
index a9c3070e463a..9cefeb32a0af 100644
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	oozie
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
 		LOCAL/demon/:maven \
@@ -28,7 +29,7 @@ USES=		shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 TOMCAT_VERSION=	6.0.41
-HADOOP_VERSION=	2.6.0		# Matches devel/hadoop2
+HADOOP_VERSION=	2.7.1		# Matches devel/hadoop2
 SHEBANG_FILES=	client/src/main/bin/oozie distro/src/main/bin/addtowar.sh distro/src/main/bin/oozied.sh distro/src/main/bin/oozie-setup.sh distro/src/main/bin/oozie-sys.sh tools/src/main/bin/ooziedb.sh core/src/main/conf/oozie-env.sh
 
 OOZIE_USER=	oozie
@@ -63,11 +64,11 @@ do-install:
 	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/conf && ${INSTALL_DATA} oozie-default.xml oozie-env.sh oozie-log4j.properties ${STAGEDIR}${PREFIX}/oozie/conf/
 	${INSTALL_DATA} ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/conf/action-conf/hive.xml ${STAGEDIR}${PREFIX}/oozie/conf/action-conf/
 	${INSTALL_DATA} ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/conf/oozie-site.xml ${STAGEDIR}${PREFIX}/oozie/conf/oozie-site.xml.sample
-	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION} && ${COPYTREE_SHARE} "lib libtools oozie-client-4.1.0.tar.gz oozie-core oozie-examples.tar.gz oozie-server oozie-sharelib-4.1.0.tar.gz oozie.war" ${STAGEDIR}${PREFIX}/oozie/
+	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION} && ${COPYTREE_SHARE} "lib libtools oozie-client-${PORTVERSION}.tar.gz oozie-core oozie-examples.tar.gz oozie-server oozie-sharelib-${PORTVERSION}.tar.gz oozie.war" ${STAGEDIR}${PREFIX}/oozie/
 	${CHMOD} 755 ${STAGEDIR}${PREFIX}/oozie/oozie-server/bin/catalina.sh ${STAGEDIR}${PREFIX}/oozie/oozie-server/bin/setclasspath.sh
 	${FIND} ${STAGEDIR}${PREFIX}/oozie/oozie-server/conf -name '*.xml' -or -name '*.properties' | ${XARGS} ${CHMOD} 644
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ext-2.2.zip ${STAGEDIR}${PREFIX}/oozie/libext/
-	cd ${PREFIX}/share/hadoop/common/lib && ${INSTALL_DATA} activation-1.1.jar avro-1.7.4.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar commons-codec-1.4.jar commons-collections-3.2.1.jar commons-compress-1.4.1.jar commons-configuration-1.6.jar commons-digester-1.8.jar commons-httpclient-3.1.jar commons-io-2.4.jar commons-lang-2.6.jar commons-logging-1.1.3.jar commons-math3-3.1.1.jar commons-net-3.1.jar guava-11.0.2.jar httpclient-4.2.5.jar httpcore-4.2.5.jar jackson-core-asl-1.9.13.jar jackson-mapper-asl-1.9.13.jar jaxb-api-2.2.2.jar jersey-core-1.9.jar jetty-util-6.1.14.jar jsr305-1.3.9.jar log4j-1.2.17.jar paranamer-2.3.jar protobuf-java-2.5.0.jar servlet-api-2.5.jar slf4j-api-1.7.5.jar slf4j-log4j12-1.7.5.jar snappy-java-1.0.4.1.jar stax-api-1.0-2.jar xmlenc-0.52.jar xz-1.0.jar zookeeper-3.4.6.jar ${STAGEDIR}${PREFIX}/oozie/libext/
+	cd ${PREFIX}/share/hadoop/common/lib && ${INSTALL_DATA} activation-1.1.jar avro-1.7.4.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar commons-codec-1.4.jar commons-collections-3.2.1.jar commons-compress-1.4.1.jar commons-configuration-1.6.jar commons-digester-1.8.jar commons-httpclient-3.1.jar commons-io-2.4.jar commons-lang-2.6.jar commons-logging-1.1.3.jar commons-math3-3.1.1.jar commons-net-3.1.jar guava-11.0.2.jar httpclient-4.2.5.jar httpcore-4.2.5.jar jackson-core-asl-1.9.13.jar jackson-mapper-asl-1.9.13.jar jaxb-api-2.2.2.jar jersey-core-1.9.jar jetty-util-6.1.14.jar jsr305-3.0.0.jar log4j-1.2.17.jar paranamer-2.3.jar protobuf-java-2.5.0.jar servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-java-1.0.4.1.jar stax-api-1.0-2.jar xmlenc-0.52.jar xz-1.0.jar zookeeper-3.4.6.jar ${STAGEDIR}${PREFIX}/oozie/libext/
 	cd ${PREFIX}/share/hadoop && ${INSTALL_DATA} common/lib/hadoop-annotations-${HADOOP_VERSION}.jar common/lib/hadoop-auth-${HADOOP_VERSION}.jar common/hadoop-common-${HADOOP_VERSION}.jar hdfs/hadoop-hdfs-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-app-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-common-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-core-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-jobclient-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-shuffle-${HADOOP_VERSION}.jar yarn/hadoop-yarn-api-${HADOOP_VERSION}.jar yarn/hadoop-yarn-client-${HADOOP_VERSION}.jar yarn/hadoop-yarn-common-${HADOOP_VERSION}.jar yarn/hadoop-yarn-server-common-${HADOOP_VERSION}.jar ${STAGEDIR}${PREFIX}/oozie/libext/
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/hadoop-client-${HADOOP_VERSION}.jar ${STAGEDIR}${PREFIX}/oozie/libext/
 	cd ${STAGEDIR}${PREFIX}/oozie && bin/oozie-setup.sh prepare-war
diff --git a/devel/oozie/distinfo b/devel/oozie/distinfo
index 6234105c5b60..1a264ba1ffe8 100644
--- a/devel/oozie/distinfo
+++ b/devel/oozie/distinfo
@@ -6,5 +6,5 @@ SHA256 (hadoop/apache-tomcat-6.0.41.tar.gz) = 2eb2812b42f3559690542fcb9ea0c1f43d
 SIZE (hadoop/apache-tomcat-6.0.41.tar.gz) = 7176167
 SHA256 (hadoop/ext-2.2.zip) = c463e298c7cc6fe3c5c863424a688b53a452bfe8f136bf20002e15b2bd201369
 SIZE (hadoop/ext-2.2.zip) = 6800612
-SHA256 (hadoop/hadoop-client-2.6.0.jar) = e05887af8d943969273f0cf48edafcaefa79519d9193f8337e68b5e05e62d1da
-SIZE (hadoop/hadoop-client-2.6.0.jar) = 2556
+SHA256 (hadoop/hadoop-client-2.7.1.jar) = 7eef4e1162da1129bfdf59dd390bcb90c33332db4aeaeec37efc701413361051
+SIZE (hadoop/hadoop-client-2.7.1.jar) = 2545
diff --git a/devel/oozie/pkg-plist b/devel/oozie/pkg-plist
index fcbf096ba529..f7f6e655ba75 100644
--- a/devel/oozie/pkg-plist
+++ b/devel/oozie/pkg-plist
@@ -68,13 +68,13 @@ oozie/libext/jackson-mapper-asl-1.9.13.jar
 oozie/libext/jaxb-api-2.2.2.jar
 oozie/libext/jersey-core-1.9.jar
 oozie/libext/jetty-util-6.1.14.jar
-oozie/libext/jsr305-1.3.9.jar
+oozie/libext/jsr305-3.0.0.jar
 oozie/libext/log4j-1.2.17.jar
 oozie/libext/paranamer-2.3.jar
 oozie/libext/protobuf-java-2.5.0.jar
 oozie/libext/servlet-api-2.5.jar
-oozie/libext/slf4j-api-1.7.5.jar
-oozie/libext/slf4j-log4j12-1.7.5.jar
+oozie/libext/slf4j-api-1.7.10.jar
+oozie/libext/slf4j-log4j12-1.7.10.jar
 oozie/libext/snappy-java-1.0.4.1.jar
 oozie/libext/stax-api-1.0-2.jar
 oozie/libext/xmlenc-0.52.jar