Attachment 147466 Details for Bug 193774 – hadoop port patch

[patch] hadoop port patch

hadoop2.patch (text/plain), 26.61 KB, created by Radim Kolar on 2014-09-19 15:51:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2014-09-19 15:51:58 UTC

Size: 26.61 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with less
>diff -ruN /usr/ports/devel/hadoop2/Makefile ./Makefile
>--- /usr/ports/devel/hadoop2/Makefile	2014-08-18 18:43:24.000000000 +0200
>+++ ./Makefile	2014-09-19 15:41:33.000000000 +0200
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/devel/hadoop2/Makefile 365325 2014-08-18 16:43:24Z bdrewery $
> 
> PORTNAME=	hadoop
>-PORTVERSION=	2.4.1
>-PORTREVISION=	2
>+PORTVERSION=	2.5.1
>+PORTREVISION=	0
> CATEGORIES=	devel java
> MASTER_SITES=	${MASTER_SITE_APACHE} \
> 		LOCAL/demon/:maven \
>@@ -12,7 +12,10 @@
> 		http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
> MASTER_SITE_SUBDIR=${PORTNAME}/common/stable
> PKGNAMESUFFIX=	2
>-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat jetty-6.1.14.zip:jetty
>+DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
>+		apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat \
>+		jetty-6.1.14.zip:jetty \
>+		FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven
> DIST_SUBDIR=	hadoop
> 
> MAINTAINER=	demon@FreeBSD.org
>diff -ruN /usr/ports/devel/hadoop2/distinfo ./distinfo
>--- /usr/ports/devel/hadoop2/distinfo	2014-07-07 14:52:14.000000000 +0200
>+++ ./distinfo	2014-09-19 15:41:48.000000000 +0200
>@@ -1,8 +1,8 @@
>-SHA256 (hadoop/hadoop-2.4.1-src.tar.gz) = 09f897738e9d34bceb7e7d4494bbc75e363fb32993f56dc5a6de8aab3419b990
>-SIZE (hadoop/hadoop-2.4.1-src.tar.gz) = 15417097
>-SHA256 (hadoop/FreeBSD-hadoop2-2.4.1-maven-repository.tar.gz) = b4698f60eff9aca6fa2e9792bc6d0d6745fa7c7e909c6fdd0c8f85daf1f0deea
>-SIZE (hadoop/FreeBSD-hadoop2-2.4.1-maven-repository.tar.gz) = 71669612
>+SHA256 (hadoop/hadoop-2.5.1-src.tar.gz) = 1cc6d1f71404dad42b5a91ca44d0edf81e48d29e307d4a48c3b07e53db0e348f
>+SIZE (hadoop/hadoop-2.5.1-src.tar.gz) = 15409310
> SHA256 (hadoop/apache-tomcat-6.0.36.tar.gz) = bc1be532d48a239a6945b028bf8f253087d3405f6522229226c484bf8ae4d45e
> SIZE (hadoop/apache-tomcat-6.0.36.tar.gz) = 6780936
> SHA256 (hadoop/jetty-6.1.14.zip) = ce8a9cf74c7f3a0099438f33b3adcef07d82347d3d67359da2116660e1571187
> SIZE (hadoop/jetty-6.1.14.zip) = 24903728
>+SHA256 (hadoop/FreeBSD-hadoop2-2.5.1-maven-repository.tar.gz) = 3243b1f31f40b83aecbc63b24d21ee8bf58347a8eed88c9d92bb7ec2bb1d58db
>+SIZE (hadoop/FreeBSD-hadoop2-2.5.1-maven-repository.tar.gz) = 74406845
>diff -ruN /usr/ports/devel/hadoop2/pkg-plist ./pkg-plist
>--- /usr/ports/devel/hadoop2/pkg-plist	2014-09-02 16:42:30.000000000 +0200
>+++ ./pkg-plist	2014-09-19 10:16:08.000000000 +0200
>@@ -44,9 +44,9 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpfs-default.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mapred-default.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yarn-default.xml
>-%%DATADIR%%/common/hadoop-common-2.4.1-tests.jar
>-%%DATADIR%%/common/hadoop-common-2.4.1.jar
>-%%DATADIR%%/common/hadoop-nfs-2.4.1.jar
>+%%DATADIR%%/common/hadoop-common-%%PORTVERSION%%-tests.jar
>+%%DATADIR%%/common/hadoop-common-%%PORTVERSION%%.jar
>+%%DATADIR%%/common/hadoop-nfs-%%PORTVERSION%%.jar
> %%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
>@@ -61,6 +61,10 @@
> %%DATADIR%%/common/jdiff/hadoop_0.20.1.xml
> %%DATADIR%%/common/jdiff/hadoop_0.20.2.xml
> %%DATADIR%%/common/lib/activation-1.1.jar
>+%%DATADIR%%/common/lib/apacheds-i18n-2.0.0-M15.jar
>+%%DATADIR%%/common/lib/apacheds-kerberos-codec-2.0.0-M15.jar
>+%%DATADIR%%/common/lib/api-asn1-api-1.0.0-M20.jar
>+%%DATADIR%%/common/lib/api-util-1.0.0-M20.jar
> %%DATADIR%%/common/lib/asm-3.2.jar
> %%DATADIR%%/common/lib/avro-1.7.4.jar
> %%DATADIR%%/common/lib/commons-beanutils-1.7.0.jar
>@@ -79,14 +83,15 @@
> %%DATADIR%%/common/lib/commons-math3-3.1.1.jar
> %%DATADIR%%/common/lib/commons-net-3.1.jar
> %%DATADIR%%/common/lib/guava-11.0.2.jar
>-%%DATADIR%%/common/lib/hadoop-annotations-2.4.1.jar
>-%%DATADIR%%/common/lib/hadoop-auth-2.4.1.jar
>+%%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/httpclient-4.2.5.jar
> %%DATADIR%%/common/lib/httpcore-4.2.5.jar
>-%%DATADIR%%/common/lib/jackson-core-asl-1.8.8.jar
>-%%DATADIR%%/common/lib/jackson-jaxrs-1.8.8.jar
>-%%DATADIR%%/common/lib/jackson-mapper-asl-1.8.8.jar
>-%%DATADIR%%/common/lib/jackson-xc-1.8.8.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
>@@ -102,7 +107,7 @@
> %%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/junit-4.8.2.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
> %%DATADIR%%/common/lib/netty-3.6.2.Final.jar
>@@ -115,11 +120,11 @@
> %%DATADIR%%/common/lib/stax-api-1.0-2.jar
> %%DATADIR%%/common/lib/xmlenc-0.52.jar
> %%DATADIR%%/common/lib/xz-1.0.jar
>-%%DATADIR%%/common/lib/zookeeper-3.4.5.jar
>+%%DATADIR%%/common/lib/zookeeper-3.4.6.jar
> %%DATADIR%%/common/templates/core-site.xml
>-%%DATADIR%%/hdfs/hadoop-hdfs-2.4.1-tests.jar
>-%%DATADIR%%/hdfs/hadoop-hdfs-2.4.1.jar
>-%%DATADIR%%/hdfs/hadoop-hdfs-nfs-2.4.1.jar
>+%%DATADIR%%/hdfs/hadoop-hdfs-%%PORTVERSION%%-tests.jar
>+%%DATADIR%%/hdfs/hadoop-hdfs-%%PORTVERSION%%.jar
>+%%DATADIR%%/hdfs/hadoop-hdfs-nfs-%%PORTVERSION%%.jar
> %%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
>@@ -132,8 +137,8 @@
> %%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/jackson-core-asl-1.8.8.jar
>-%%DATADIR%%/hdfs/lib/jackson-mapper-asl-1.8.8.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
>@@ -152,7 +157,6 @@
> %%DATADIR%%/hdfs/webapps/datanode/robots.txt
> %%DATADIR%%/hdfs/webapps/hdfs/WEB-INF/web.xml
> %%DATADIR%%/hdfs/webapps/hdfs/decommission.xsl
>-%%DATADIR%%/hdfs/webapps/hdfs/dfs-dust.js
> %%DATADIR%%/hdfs/webapps/hdfs/dfsclusterhealth.xsl
> %%DATADIR%%/hdfs/webapps/hdfs/dfsclusterhealth_utils.xsl
> %%DATADIR%%/hdfs/webapps/hdfs/dfshealth.html
>@@ -164,12 +168,15 @@
> %%DATADIR%%/hdfs/webapps/journal/index.html
> %%DATADIR%%/hdfs/webapps/secondary/WEB-INF/web.xml
> %%DATADIR%%/hdfs/webapps/secondary/index.html
>+%%DATADIR%%/hdfs/webapps/secondary/snn.js
>+%%DATADIR%%/hdfs/webapps/secondary/status.html
> %%DATADIR%%/hdfs/webapps/static/bootstrap-3.0.2/css/bootstrap.min.css
> %%DATADIR%%/hdfs/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.eot
> %%DATADIR%%/hdfs/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.svg
> %%DATADIR%%/hdfs/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.ttf
> %%DATADIR%%/hdfs/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.woff
> %%DATADIR%%/hdfs/webapps/static/bootstrap-3.0.2/js/bootstrap.min.js
>+%%DATADIR%%/hdfs/webapps/static/dfs-dust.js
> %%DATADIR%%/hdfs/webapps/static/dust-full-2.0.0.min.js
> %%DATADIR%%/hdfs/webapps/static/dust-helpers-1.1.1.min.js
> %%DATADIR%%/hdfs/webapps/static/hadoop.css
>@@ -246,6 +253,7 @@
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/client/HttpFSUtils.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/client/HttpsFSFileSystem.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSAclStatus.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSAppend.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSConcat.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSContentSummary.class
>@@ -253,21 +261,33 @@
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSDelete.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSFileChecksum.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSFileStatus.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSGetXAttrs.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSHomeDir.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSListStatus.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSListXAttrs.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSMkdirs.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSModifyAclEntries.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSOpen.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSRemoveAcl.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSRemoveAclEntries.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSRemoveDefaultAcl.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSRemoveXAttr.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSRename.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSSetAcl.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSSetOwner.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/FSOperations$FSSetPermission.class
> %%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$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
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSKerberosAuthenticationHandler$1.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSKerberosAuthenticationHandler.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$AccessTimeParam.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$AclPermissionParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$BlockSizeParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$DataParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$DestinationParam.class
>@@ -284,6 +304,10 @@
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$RecursiveParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$ReplicationParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$SourcesParam.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$XAttrEncodingParam.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$XAttrNameParam.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$XAttrSetFlagParam.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider$XAttrValueParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/fs/http/server/HttpFSServer$1.class
>@@ -345,6 +369,7 @@
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/BooleanParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/ByteParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/EnumParam.class
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/EnumSetParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/ExceptionProvider.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/InputStreamEntity.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/IntegerParam.class
>@@ -360,6 +385,10 @@
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/UserProvider$UserParam.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/classes/org/apache/hadoop/lib/wsrs/UserProvider.class
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/activation-1.1.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/apacheds-i18n-2.0.0-M15.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/apacheds-kerberos-codec-2.0.0-M15.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/api-asn1-api-1.0.0-M20.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/api-util-1.0.0-M20.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/asm-3.2.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/avro-1.7.4.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/commons-beanutils-1.7.0.jar
>@@ -377,16 +406,16 @@
> %%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/guava-11.0.2.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-annotations-2.4.1.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-auth-2.4.1.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-common-2.4.1.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-hdfs-2.4.1.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/hadoop-annotations-%%PORTVERSION%%.jar
>+%%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/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.8.8.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-jaxrs-1.8.8.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-mapper-asl-1.8.8.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-xc-1.8.8.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-core-asl-1.9.13.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-jaxrs-1.9.13.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jackson-xc-1.9.13.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jaxb-api-2.2.2.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jaxb-impl-2.2.3-1.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/jersey-core-1.9.jar
>@@ -397,6 +426,7 @@
> %%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/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/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
>@@ -404,7 +434,7 @@
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/snappy-java-1.0.4.1.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/xmlenc-0.52.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/xz-1.0.jar
>-%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/zookeeper-3.4.5.jar
>+%%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/zookeeper-3.4.6.jar
> %%DATADIR%%/httpfs/tomcat/webapps/webhdfs/WEB-INF/web.xml
> libexec/hadoop-config.sh
> libexec/hadoop-layout.sh
>@@ -412,15 +442,15 @@
> libexec/httpfs-config.sh
> libexec/mapred-config.sh
> libexec/yarn-config.sh
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-app-2.4.1.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-common-2.4.1.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-core-2.4.1.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-hs-2.4.1.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-hs-plugins-2.4.1.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-jobclient-2.4.1-tests.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-jobclient-2.4.1.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-client-shuffle-2.4.1.jar
>-%%DATADIR%%/mapreduce/hadoop-mapreduce-examples-2.4.1.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-app-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-common-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-core-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-hs-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-hs-plugins-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-jobclient-%%PORTVERSION%%-tests.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-jobclient-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-client-shuffle-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/hadoop-mapreduce-examples-%%PORTVERSION%%.jar
> %%DATADIR%%/mapreduce/lib-examples/hsqldb-2.0.0.jar
> %%DATADIR%%/mapreduce/lib/aopalliance-1.0.jar
> %%DATADIR%%/mapreduce/lib/asm-3.2.jar
>@@ -429,15 +459,16 @@
> %%DATADIR%%/mapreduce/lib/commons-io-2.4.jar
> %%DATADIR%%/mapreduce/lib/guice-3.0.jar
> %%DATADIR%%/mapreduce/lib/guice-servlet-3.0.jar
>-%%DATADIR%%/mapreduce/lib/hadoop-annotations-2.4.1.jar
>-%%DATADIR%%/mapreduce/lib/hamcrest-core-1.1.jar
>-%%DATADIR%%/mapreduce/lib/jackson-core-asl-1.8.8.jar
>-%%DATADIR%%/mapreduce/lib/jackson-mapper-asl-1.8.8.jar
>+%%DATADIR%%/mapreduce/lib/hadoop-annotations-%%PORTVERSION%%.jar
>+%%DATADIR%%/mapreduce/lib/hamcrest-core-1.3.jar
>+%%DATADIR%%/mapreduce/lib/jackson-core-asl-1.9.13.jar
>+%%DATADIR%%/mapreduce/lib/jackson-mapper-asl-1.9.13.jar
> %%DATADIR%%/mapreduce/lib/javax.inject-1.jar
> %%DATADIR%%/mapreduce/lib/jersey-core-1.9.jar
> %%DATADIR%%/mapreduce/lib/jersey-guice-1.9.jar
> %%DATADIR%%/mapreduce/lib/jersey-server-1.9.jar
>-%%DATADIR%%/mapreduce/lib/junit-4.10.jar
>+%%DATADIR%%/mapreduce/lib/junit-4.11.jar
>+%%DATADIR%%/mapreduce/lib/leveldbjni-all-1.8.jar
> %%DATADIR%%/mapreduce/lib/log4j-1.2.17.jar
> %%DATADIR%%/mapreduce/lib/netty-3.6.2.Final.jar
> %%DATADIR%%/mapreduce/lib/paranamer-2.3.jar
>@@ -465,6 +496,10 @@
> sbin/yarn-daemon.sh
> sbin/yarn-daemons.sh
> %%DATADIR%%/tools/lib/activation-1.1.jar
>+%%DATADIR%%/tools/lib/apacheds-i18n-2.0.0-M15.jar
>+%%DATADIR%%/tools/lib/apacheds-kerberos-codec-2.0.0-M15.jar
>+%%DATADIR%%/tools/lib/api-asn1-api-1.0.0-M20.jar
>+%%DATADIR%%/tools/lib/api-util-1.0.0-M20.jar
> %%DATADIR%%/tools/lib/asm-3.2.jar
> %%DATADIR%%/tools/lib/avro-1.7.4.jar
> %%DATADIR%%/tools/lib/commons-beanutils-1.7.0.jar
>@@ -483,23 +518,23 @@
> %%DATADIR%%/tools/lib/commons-math3-3.1.1.jar
> %%DATADIR%%/tools/lib/commons-net-3.1.jar
> %%DATADIR%%/tools/lib/guava-11.0.2.jar
>-%%DATADIR%%/tools/lib/hadoop-archives-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-auth-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-datajoin-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-distcp-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-extras-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-gridmix-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-openstack-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-rumen-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-sls-2.4.1.jar
>-%%DATADIR%%/tools/lib/hadoop-streaming-2.4.1.jar
>-%%DATADIR%%/tools/lib/hamcrest-core-1.1.jar
>+%%DATADIR%%/tools/lib/hadoop-archives-%%PORTVERSION%%.jar
>+%%DATADIR%%/tools/lib/hadoop-auth-%%PORTVERSION%%.jar
>+%%DATADIR%%/tools/lib/hadoop-datajoin-%%PORTVERSION%%.jar
>+%%DATADIR%%/tools/lib/hadoop-distcp-%%PORTVERSION%%.jar
>+%%DATADIR%%/tools/lib/hadoop-extras-%%PORTVERSION%%.jar
>+%%DATADIR%%/tools/lib/hadoop-gridmix-%%PORTVERSION%%.jar
>+%%DATADIR%%/tools/lib/hadoop-openstack-%%PORTVERSION%%.jar
>+%%DATADIR%%/tools/lib/hadoop-rumen-%%PORTVERSION%%.jar
>+%%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/httpclient-4.2.5.jar
> %%DATADIR%%/tools/lib/httpcore-4.2.5.jar
>-%%DATADIR%%/tools/lib/jackson-core-asl-1.8.8.jar
>-%%DATADIR%%/tools/lib/jackson-jaxrs-1.8.8.jar
>-%%DATADIR%%/tools/lib/jackson-mapper-asl-1.8.8.jar
>-%%DATADIR%%/tools/lib/jackson-xc-1.8.8.jar
>+%%DATADIR%%/tools/lib/jackson-core-asl-1.9.13.jar
>+%%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
>@@ -515,8 +550,9 @@
> %%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/junit-4.10.jar
>+%%DATADIR%%/tools/lib/junit-4.11.jar
> %%DATADIR%%/tools/lib/log4j-1.2.17.jar
>+%%DATADIR%%/tools/lib/netty-3.6.2.Final.jar
> %%DATADIR%%/tools/lib/metrics-core-3.0.0.jar
> %%DATADIR%%/tools/lib/paranamer-2.3.jar
> %%DATADIR%%/tools/lib/protobuf-java-2.5.0.jar
>@@ -525,7 +561,7 @@
> %%DATADIR%%/tools/lib/stax-api-1.0-2.jar
> %%DATADIR%%/tools/lib/xmlenc-0.52.jar
> %%DATADIR%%/tools/lib/xz-1.0.jar
>-%%DATADIR%%/tools/lib/zookeeper-3.4.5.jar
>+%%DATADIR%%/tools/lib/zookeeper-3.4.6.jar
> %%DATADIR%%/tools/sls/bin/rumen2sls.sh
> %%DATADIR%%/tools/sls/bin/slsrun.sh
> %%DATADIR%%/tools/sls/html/css/bootstrap-responsive.min.css
>@@ -544,17 +580,17 @@
> %%DATADIR%%/tools/sls/sample-conf/sls-runner.xml
> %%DATADIR%%/tools/sls/sample-conf/yarn-site.xml
> %%DATADIR%%/tools/sls/sample-data/2jobs2min-rumen-jh.json
>-%%DATADIR%%/yarn/hadoop-yarn-api-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-applications-distributedshell-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-applications-unmanaged-am-launcher-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-client-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-common-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-server-applicationhistoryservice-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-server-common-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-server-nodemanager-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-server-resourcemanager-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-server-tests-2.4.1.jar
>-%%DATADIR%%/yarn/hadoop-yarn-server-web-proxy-2.4.1.jar
>+%%DATADIR%%/yarn/hadoop-yarn-api-%%PORTVERSION%%.jar
>+%%DATADIR%%/yarn/hadoop-yarn-applications-distributedshell-%%PORTVERSION%%.jar
>+%%DATADIR%%/yarn/hadoop-yarn-applications-unmanaged-am-launcher-%%PORTVERSION%%.jar
>+%%DATADIR%%/yarn/hadoop-yarn-client-%%PORTVERSION%%.jar
>+%%DATADIR%%/yarn/hadoop-yarn-common-%%PORTVERSION%%.jar
>+%%DATADIR%%/yarn/hadoop-yarn-server-applicationhistoryservice-%%PORTVERSION%%.jar
>+%%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-tests-%%PORTVERSION%%.jar
>+%%DATADIR%%/yarn/hadoop-yarn-server-web-proxy-%%PORTVERSION%%.jar
> %%DATADIR%%/yarn/lib/activation-1.1.jar
> %%DATADIR%%/yarn/lib/aopalliance-1.0.jar
> %%DATADIR%%/yarn/lib/asm-3.2.jar
>@@ -569,10 +605,10 @@
> %%DATADIR%%/yarn/lib/guava-11.0.2.jar
> %%DATADIR%%/yarn/lib/guice-3.0.jar
> %%DATADIR%%/yarn/lib/guice-servlet-3.0.jar
>-%%DATADIR%%/yarn/lib/jackson-core-asl-1.8.8.jar
>-%%DATADIR%%/yarn/lib/jackson-jaxrs-1.8.8.jar
>-%%DATADIR%%/yarn/lib/jackson-mapper-asl-1.8.8.jar
>-%%DATADIR%%/yarn/lib/jackson-xc-1.8.8.jar
>+%%DATADIR%%/yarn/lib/jackson-core-asl-1.9.13.jar
>+%%DATADIR%%/yarn/lib/jackson-jaxrs-1.9.13.jar
>+%%DATADIR%%/yarn/lib/jackson-mapper-asl-1.9.13.jar
>+%%DATADIR%%/yarn/lib/jackson-xc-1.9.13.jar
> %%DATADIR%%/yarn/lib/javax.inject-1.jar
> %%DATADIR%%/yarn/lib/jaxb-api-2.2.2.jar
> %%DATADIR%%/yarn/lib/jaxb-impl-2.2.3-1.jar
>@@ -588,12 +624,13 @@
> %%DATADIR%%/yarn/lib/jsr305-1.3.9.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
> %%DATADIR%%/yarn/lib/protobuf-java-2.5.0.jar
> %%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.5.jar
>-%%DATADIR%%/yarn/test/hadoop-yarn-server-tests-2.4.1-tests.jar
>+%%DATADIR%%/yarn/lib/zookeeper-3.4.6.jar
>+%%DATADIR%%/yarn/test/hadoop-yarn-server-tests-%%PORTVERSION%%-tests.jar
> @dirrm %%EXAMPLESDIR%%/conf
> @dirrm %%EXAMPLESDIR%%
> @dirrm %%DATADIR%%/common/jdiff
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 193774: 147466 | 147467