ODPI-120 Changed all of the jar regular expressions to not exlude additional numbers past the version number. Also added and removed files lookfor in BINCONTENT and JARCONTENT to make it match Apache binary distribution.

(cherry picked from commit 1a945892c90af03f76dfa00d2b665665c1c92cdb)

7 files changed, 468 insertions, 480 deletions

diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list
index b3e508d5..b32f5a2b 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list
@@ -1,3 +1,5 @@
 rcc
 hadoop
-fuse_dfs
+hdfs
+yarn
+mapred
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-jar.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-jar.list
index 9a99d6b9..d16f1115 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-jar.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-jar.list
@@ -1,60 +1,60 @@
-api-util-1\.0\.0-M20([^.0-9].*)?\.jar
-curator-recipes-2\.7\.1([^.0-9].*)?\.jar
-curator-framework-2\.7\.1([^.0-9].*)?\.jar
-netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-gson-2\.2\.4([^.0-9].*)?\.jar
-paranamer-2\.3([^.0-9].*)?\.jar
-jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-jackson-xc-1\.9\.13([^.0-9].*)?\.jar
-jersey-server-1\.9([^.0-9].*)?\.jar
-stax-api-1\.0-2([^.0-9].*)?\.jar
-zookeeper-3\.4\.6([^.0-9].*)?\.jar
-htrace-core-3\.1\.0-incubating([^.0-9].*)?\.jar
-slf4j-api-1\.7\.10([^.0-9].*)?\.jar
-avro-1\.7\.[4-7]([^.0-9].*)?\.jar
-slf4j-log4j12-1\.7\.10([^.0-9].*)?\.jar
-curator-client-2\.7\.1([^.0-9].*)?\.jar
-jets3t-0\.9\.0([^.0-9].*)?\.jar
-commons-net-3\.1([^.0-9].*)?\.jar
-jaxb-impl-2\.2\.3-1([^.0-9].*)?\.jar
-httpclient-4\.2\.5([^.0-9].*)?\.jar
-apacheds-kerberos-codec-2\.0\.0-M15([^.0-9].*)?\.jar
-commons-cli-1\.2([^.0-9].*)?\.jar
-log4j-1\.2\.17([^.0-9].*)?\.jar
-jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-java-xmlbuilder-0\.4([^.0-9].*)?\.jar
-jsp-api-2\.1([^.0-9].*)?\.jar
-guava-11\.0\.2([^.0-9].*)?\.jar
-jetty-6\.1\.26([^.0-9].*)?\.jar
-commons-logging-1\.1\.3([^.0-9].*)?\.jar
-snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
-commons-httpclient-3\.1([^.0-9].*)?\.jar
-jsch-0\.1\.(4[2-9]|[5-9]\d)([^.0-9].*)?\.jar
-jersey-core-1\.9([^.0-9].*)?\.jar
-commons-compress-1\.4\.1([^.0-9].*)?\.jar
-jettison-1\.1([^.0-9].*)?\.jar
-junit-4\.11([^.0-9].*)?\.jar
-commons-collections-3\.2\.[12]([^.0-9].*)?\.jar
-xz-1\.0([^.0-9].*)?\.jar
-asm-3\.2([^.0-9].*)?\.jar
-commons-codec-1\.4([^.0-9].*)?\.jar
-commons-digester-1\.8([^.0-9].*)?\.jar
-api-asn1-api-1\.0\.0-M20([^.0-9].*)?\.jar
-xmlenc-0\.52([^.0-9].*)?\.jar
-commons-configuration-1\.6([^.0-9].*)?\.jar
-mockito-all-1\.8\.5([^.0-9].*)?\.jar
-commons-lang-2\.6([^.0-9].*)?\.jar
-jetty-util-6\.1\.26([^.0-9].*)?\.jar
-jsr305-3\.0\.0([^.0-9].*)?\.jar
-protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-httpcore-4\.2\.5([^.0-9].*)?\.jar
-commons-io-2\.4([^.0-9].*)?\.jar
-activation-1\.1([^.0-9].*)?\.jar
-jersey-json-1\.9([^.0-9].*)?\.jar
-jaxb-api-2\.2\.2([^.0-9].*)?\.jar
-commons-math3-3\.1\.1([^.0-9].*)?\.jar
-hamcrest-core-1\.3([^.0-9].*)?\.jar
-commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
-apacheds-i18n-2\.0\.0-M15([^.0-9].*)?\.jar
-servlet-api-2\.5([^.0-9].*)?\.jar
-jackson-jaxrs-1\.9\.13([^.0-9].*)?\.jar
+api-util-1\.0\.0-M20.*\.jar
+curator-recipes-2\.7\.1.*\.jar
+curator-framework-2\.7\.1.*\.jar
+netty-3\.6\.2\.Final.*\.jar
+gson-2\.2\.4.*\.jar
+paranamer-2\.3.*\.jar
+jackson-core-asl-1\.9\.13.*\.jar
+jackson-xc-1\.9\.13.*\.jar
+jersey-server-1\.9.*\.jar
+stax-api-1\.0-2.*\.jar
+zookeeper-3\.4\.6.*\.jar
+htrace-core-3\.1\.0-incubating.*\.jar
+slf4j-api-1\.7\.10.*\.jar
+avro-1\.7\.[4-7].*\.jar
+slf4j-log4j12-1\.7\.10.*\.jar
+curator-client-2\.7\.1.*\.jar
+jets3t-0\.9\.0.*\.jar
+commons-net-3\.1.*\.jar
+jaxb-impl-2\.2\.3-1.*\.jar
+httpclient-4\.2\.5.*\.jar
+apacheds-kerberos-codec-2\.0\.0-M15.*\.jar
+commons-cli-1\.2.*\.jar
+log4j-1\.2\.17.*\.jar
+jackson-mapper-asl-1\.9\.13.*\.jar
+java-xmlbuilder-0\.4.*\.jar
+jsp-api-2\.1.*\.jar
+guava-11\.0\.2.*\.jar
+jetty-6\.1\.26.*\.jar
+commons-logging-1\.1\.3.*\.jar
+snappy-java-1\.0\.[45](\.[0-9])?.*\.jar
+commons-httpclient-3\.1.*\.jar
+jsch-0\.1\.(4[2-9]|[5-9]\d).*\.jar
+jersey-core-1\.9.*\.jar
+commons-compress-1\.4\.1.*\.jar
+jettison-1\.1.*\.jar
+junit-4\.11.*\.jar
+commons-collections-3\.2\.[12].*\.jar
+xz-1\.0.*\.jar
+asm-3\.2.*\.jar
+commons-codec-1\.4.*\.jar
+commons-digester-1\.8.*\.jar
+api-asn1-api-1\.0\.0-M20.*\.jar
+xmlenc-0\.52.*\.jar
+commons-configuration-1\.6.*\.jar
+mockito-all-1\.8\.5.*\.jar
+commons-lang-2\.6.*\.jar
+jetty-util-6\.1\.26.*\.jar
+jsr305-3\.0\.0.*\.jar
+protobuf-java-2\.5\.0.*\.jar
+httpcore-4\.2\.5.*\.jar
+commons-io-2\.4.*\.jar
+activation-1\.1.*\.jar
+jersey-json-1\.9.*\.jar
+jaxb-api-2\.2\.2.*\.jar
+commons-math3-3\.1\.1.*\.jar
+hamcrest-core-1\.3.*\.jar
+commons-beanutils(-core)?-1\.[78]\.0.*\.jar
+apacheds-i18n-2\.0\.0-M15.*\.jar
+servlet-api-2\.5.*\.jar
+jackson-jaxrs-1\.9\.13.*\.jar
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common.list
index 1e4231f8..b081c744 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common.list
@@ -1,19 +1,18 @@
 bin
-bin/fuse_dfs
 bin/rcc
 bin/hadoop
 sbin
 sbin/hadoop-daemons\.sh
 sbin/hadoop-daemon\.sh
 sbin/slaves\.sh
-hadoop-annotations-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-common-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-annotations([^.0-9].*)?\.jar
-hadoop-common-2\.7\.[0-9]([^.0-9].*)?-tests\.jar
+hadoop-annotations-2\.7\.[0-9].*\.jar
+hadoop-common-2\.7\.[0-9].*\.jar
+hadoop-annotations.*\.jar
+hadoop-common-2\.7\.[0-9].*-tests\.jar
 etc
 etc/hadoop
-hadoop-common([^.0-9].*)?\.jar
-hadoop-auth-2\.7\.[0-9]([^.0-9].*)?\.jar
+hadoop-common.*\.jar
+hadoop-auth-2\.7\.[0-9].*\.jar
 libexec
 libexec/hdfs-config\.sh
 libexec/hadoop-layout\.sh
@@ -21,181 +20,181 @@ libexec/yarn-config\.sh
 libexec/mapred-config\.sh
 libexec/hadoop-config\.sh
 libexec/init-hdfs\.sh
-hadoop-auth([^.0-9].*)?\.jar
-hadoop-nfs([^.0-9].*)?\.jar
-hadoop-nfs-2\.7\.[0-9]([^.0-9].*)?\.jar
+hadoop-auth.*\.jar
+hadoop-nfs.*\.jar
+hadoop-nfs-2\.7\.[0-9].*\.jar
 client
-client/curator-recipes([^.0-9].*)?\.jar
-client/curator-recipes-2\.7\.1([^.0-9].*)?\.jar
-client/commons-configuration([^.0-9].*)?\.jar
-client/jsr305([^.0-9].*)?\.jar
-client/slf4j-log4j12([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-core([^.0-9].*)?\.jar
-client/hadoop-hdfs([^.0-9].*)?\.jar
-client/commons-configuration-1\.6([^.0-9].*)?\.jar
-client/commons-cli-1\.2([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-common-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/commons-digester-1\.8([^.0-9].*)?\.jar
-client/curator-client-2\.7\.1([^.0-9].*)?\.jar
-client/httpclient([^.0-9].*)?\.jar
-client/commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
-client/jsp-api-2\.1([^.0-9].*)?\.jar
-client/leveldbjni-all-1\.8([^.0-9].*)?\.jar
-client/slf4j-api-1\.7\.10([^.0-9].*)?\.jar
-client/hadoop-annotations-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/jersey-core([^.0-9].*)?\.jar
-client/commons-compress([^.0-9].*)?\.jar
-client/stax-api([^.0-9].*)?\.jar
-client/jaxb-api-2\.2\.2([^.0-9].*)?\.jar
-client/api-util-1\.0\.0-M20([^.0-9].*)?\.jar
-client/jackson-xc([^.0-9].*)?\.jar
-client/commons-cli([^.0-9].*)?\.jar
-client/xml-apis([^.0-9].*)?\.jar
-client/curator-client([^.0-9].*)?\.jar
-client/curator-framework-2\.7\.1([^.0-9].*)?\.jar
-client/commons-io-2\.4([^.0-9].*)?\.jar
-client/jackson-core-asl([^.0-9].*)?\.jar
-client/avro([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-app([^.0-9].*)?\.jar
-client/jetty-util([^.0-9].*)?\.jar
-client/guava([^.0-9].*)?\.jar
-client/commons-beanutils([^.0-9].*)?\.jar
-client/apacheds-i18n([^.0-9].*)?\.jar
-client/jetty-util-6\.1\.26([^.0-9].*)?\.jar
-client/xercesImpl-2\.9\.1([^.0-9].*)?\.jar
-client/commons-logging([^.0-9].*)?\.jar
-client/slf4j-api([^.0-9].*)?\.jar
-client/commons-digester([^.0-9].*)?\.jar
-client/avro-1\.7\.[4-7]([^.0-9].*)?\.jar
-client/hadoop-common-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/commons-math3([^.0-9].*)?\.jar
-client/hadoop-yarn-common-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/hadoop-annotations([^.0-9].*)?\.jar
-client/xercesImpl([^.0-9].*)?\.jar
-client/commons-codec([^.0-9].*)?\.jar
-client/netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-client/commons-collections([^.0-9].*)?\.jar
-client/httpcore-4\.2\.5([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-jobclient([^.0-9].*)?\.jar
-client/htrace-core([^.0-9].*)?\.jar
-client/jersey-core-1\.9([^.0-9].*)?\.jar
-client/xz([^.0-9].*)?\.jar
-client/jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-client/jsp-api([^.0-9].*)?\.jar
-client/commons-httpclient([^.0-9].*)?\.jar
-client/netty([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-shuffle-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/commons-net([^.0-9].*)?\.jar
-client/hadoop-yarn-server-common([^.0-9].*)?\.jar
-client/jaxb-api([^.0-9].*)?\.jar
-client/apacheds-kerberos-codec([^.0-9].*)?\.jar
-client/httpcore([^.0-9].*)?\.jar
-client/hadoop-yarn-server-common-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/hadoop-common([^.0-9].*)?\.jar
-client/leveldbjni-all([^.0-9].*)?\.jar
-client/snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
-client/gson-2\.2\.4([^.0-9].*)?\.jar
-client/commons-net-3\.1([^.0-9].*)?\.jar
-client/api-util([^.0-9].*)?\.jar
-client/commons-compress-1\.4\.1([^.0-9].*)?\.jar
-client/jackson-xc-1\.9\.13([^.0-9].*)?\.jar
-client/netty-all-4\.0\.23\.Final([^.0-9].*)?\.jar
-client/xmlenc-0\.52([^.0-9].*)?\.jar
-client/jackson-jaxrs([^.0-9].*)?\.jar
-client/api-asn1-api([^.0-9].*)?\.jar
-client/api-asn1-api-1\.0\.0-M20([^.0-9].*)?\.jar
-client/commons-codec-1\.4([^.0-9].*)?\.jar
-client/jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-client/servlet-api-2\.5([^.0-9].*)?\.jar
-client/commons-beanutils(-core)?([^.0-9].*)?\.jar
-client/paranamer-2\.3([^.0-9].*)?\.jar
-client/hadoop-yarn-api-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-shuffle([^.0-9].*)?\.jar
-client/apacheds-i18n-2\.0\.0-M15([^.0-9].*)?\.jar
-client/hadoop-yarn-common([^.0-9].*)?\.jar
-client/hadoop-auth-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/snappy-java([^.0-9].*)?\.jar
-client/gson([^.0-9].*)?\.jar
-client/xml-apis-1\.3\.04([^.0-9].*)?\.jar
-client/commons-io([^.0-9].*)?\.jar
-client/commons-math3-3\.1\.1([^.0-9].*)?\.jar
-client/log4j([^.0-9].*)?\.jar
-client/hadoop-auth([^.0-9].*)?\.jar
-client/log4j-1\.2\.17([^.0-9].*)?\.jar
-client/servlet-api([^.0-9].*)?\.jar
-client/hadoop-hdfs-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/activation([^.0-9].*)?\.jar
-client/zookeeper([^.0-9].*)?\.jar
-client/xmlenc([^.0-9].*)?\.jar
-client/stax-api-1\.0-2([^.0-9].*)?\.jar
-client/hadoop-yarn-client-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/jersey-client-1\.9([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-common([^.0-9].*)?\.jar
-client/xz-1\.0([^.0-9].*)?\.jar
-client/zookeeper-3\.4\.6([^.0-9].*)?\.jar
-client/activation-1\.1([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-jobclient-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/htrace-core-3\.1\.0-incubating([^.0-9].*)?\.jar
-client/protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-app-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/apacheds-kerberos-codec-2\.0\.0-M15([^.0-9].*)?\.jar
-client/commons-lang([^.0-9].*)?\.jar
-client/httpclient-4\.2\.5([^.0-9].*)?\.jar
-client/paranamer([^.0-9].*)?\.jar
-client/hadoop-yarn-api([^.0-9].*)?\.jar
-client/jersey-client([^.0-9].*)?\.jar
-client/hadoop-mapreduce-client-core-2\.7\.[0-9]([^.0-9].*)?\.jar
-client/curator-framework([^.0-9].*)?\.jar
-client/guava-11\.0\.2([^.0-9].*)?\.jar
-client/jsr305-3\.0\.0([^.0-9].*)?\.jar
-client/hadoop-yarn-client([^.0-9].*)?\.jar
-client/jackson-jaxrs-1\.9\.13([^.0-9].*)?\.jar
-client/commons-httpclient-3\.1([^.0-9].*)?\.jar
-client/commons-collections-3\.2\.[12]([^.0-9].*)?\.jar
-client/netty-all([^.0-9].*)?\.jar
-client/slf4j-log4j12-1\.7\.10([^.0-9].*)?\.jar
-client/protobuf-java([^.0-9].*)?\.jar
-client/jackson-mapper-asl([^.0-9].*)?\.jar
-client/commons-logging-1\.1\.3([^.0-9].*)?\.jar
-client/commons-lang-2\.6([^.0-9].*)?\.jar
+client/curator-recipes.*\.jar
+client/curator-recipes-2\.7\.1.*\.jar
+client/commons-configuration.*\.jar
+client/jsr305.*\.jar
+client/slf4j-log4j12.*\.jar
+client/hadoop-mapreduce-client-core.*\.jar
+client/hadoop-hdfs.*\.jar
+client/commons-configuration-1\.6.*\.jar
+client/commons-cli-1\.2.*\.jar
+client/hadoop-mapreduce-client-common-2\.7\.[0-9].*\.jar
+client/commons-digester-1\.8.*\.jar
+client/curator-client-2\.7\.1.*\.jar
+client/httpclient.*\.jar
+client/commons-beanutils(-core)?-1\.[78]\.0.*\.jar
+client/jsp-api-2\.1.*\.jar
+client/leveldbjni-all-1\.8.*\.jar
+client/slf4j-api-1\.7\.10.*\.jar
+client/hadoop-annotations-2\.7\.[0-9].*\.jar
+client/jersey-core.*\.jar
+client/commons-compress.*\.jar
+client/stax-api.*\.jar
+client/jaxb-api-2\.2\.2.*\.jar
+client/api-util-1\.0\.0-M20.*\.jar
+client/jackson-xc.*\.jar
+client/commons-cli.*\.jar
+client/xml-apis.*\.jar
+client/curator-client.*\.jar
+client/curator-framework-2\.7\.1.*\.jar
+client/commons-io-2\.4.*\.jar
+client/jackson-core-asl.*\.jar
+client/avro.*\.jar
+client/hadoop-mapreduce-client-app.*\.jar
+client/jetty-util.*\.jar
+client/guava.*\.jar
+client/commons-beanutils.*\.jar
+client/apacheds-i18n.*\.jar
+client/jetty-util-6\.1\.26.*\.jar
+client/xercesImpl-2\.9\.1.*\.jar
+client/commons-logging.*\.jar
+client/slf4j-api.*\.jar
+client/commons-digester.*\.jar
+client/avro-1\.7\.[4-7].*\.jar
+client/hadoop-common-2\.7\.[0-9].*\.jar
+client/commons-math3.*\.jar
+client/hadoop-yarn-common-2\.7\.[0-9].*\.jar
+client/hadoop-annotations.*\.jar
+client/xercesImpl.*\.jar
+client/commons-codec.*\.jar
+client/netty-3\.6\.2\.Final.*\.jar
+client/commons-collections.*\.jar
+client/httpcore-4\.2\.5.*\.jar
+client/hadoop-mapreduce-client-jobclient.*\.jar
+client/htrace-core.*\.jar
+client/jersey-core-1\.9.*\.jar
+client/xz.*\.jar
+client/jackson-mapper-asl-1\.9\.13.*\.jar
+client/jsp-api.*\.jar
+client/commons-httpclient.*\.jar
+client/netty.*\.jar
+client/hadoop-mapreduce-client-shuffle-2\.7\.[0-9].*\.jar
+client/commons-net.*\.jar
+client/hadoop-yarn-server-common.*\.jar
+client/jaxb-api.*\.jar
+client/apacheds-kerberos-codec.*\.jar
+client/httpcore.*\.jar
+client/hadoop-yarn-server-common-2\.7\.[0-9].*\.jar
+client/hadoop-common.*\.jar
+client/leveldbjni-all.*\.jar
+client/snappy-java-1\.0\.[45](\.[0-9])?.*\.jar
+client/gson-2\.2\.4.*\.jar
+client/commons-net-3\.1.*\.jar
+client/api-util.*\.jar
+client/commons-compress-1\.4\.1.*\.jar
+client/jackson-xc-1\.9\.13.*\.jar
+client/netty-all-4\.0\.23\.Final.*\.jar
+client/xmlenc-0\.52.*\.jar
+client/jackson-jaxrs.*\.jar
+client/api-asn1-api.*\.jar
+client/api-asn1-api-1\.0\.0-M20.*\.jar
+client/commons-codec-1\.4.*\.jar
+client/jackson-core-asl-1\.9\.13.*\.jar
+client/servlet-api-2\.5.*\.jar
+client/commons-beanutils(-core)?.*\.jar
+client/paranamer-2\.3.*\.jar
+client/hadoop-yarn-api-2\.7\.[0-9].*\.jar
+client/hadoop-mapreduce-client-shuffle.*\.jar
+client/apacheds-i18n-2\.0\.0-M15.*\.jar
+client/hadoop-yarn-common.*\.jar
+client/hadoop-auth-2\.7\.[0-9].*\.jar
+client/snappy-java.*\.jar
+client/gson.*\.jar
+client/xml-apis-1\.3\.04.*\.jar
+client/commons-io.*\.jar
+client/commons-math3-3\.1\.1.*\.jar
+client/log4j.*\.jar
+client/hadoop-auth.*\.jar
+client/log4j-1\.2\.17.*\.jar
+client/servlet-api.*\.jar
+client/hadoop-hdfs-2\.7\.[0-9].*\.jar
+client/activation.*\.jar
+client/zookeeper.*\.jar
+client/xmlenc.*\.jar
+client/stax-api-1\.0-2.*\.jar
+client/hadoop-yarn-client-2\.7\.[0-9].*\.jar
+client/jersey-client-1\.9.*\.jar
+client/hadoop-mapreduce-client-common.*\.jar
+client/xz-1\.0.*\.jar
+client/zookeeper-3\.4\.6.*\.jar
+client/activation-1\.1.*\.jar
+client/hadoop-mapreduce-client-jobclient-2\.7\.[0-9].*\.jar
+client/htrace-core-3\.1\.0-incubating.*\.jar
+client/protobuf-java-2\.5\.0.*\.jar
+client/hadoop-mapreduce-client-app-2\.7\.[0-9].*\.jar
+client/apacheds-kerberos-codec-2\.0\.0-M15.*\.jar
+client/commons-lang.*\.jar
+client/httpclient-4\.2\.5.*\.jar
+client/paranamer.*\.jar
+client/hadoop-yarn-api.*\.jar
+client/jersey-client.*\.jar
+client/hadoop-mapreduce-client-core-2\.7\.[0-9].*\.jar
+client/curator-framework.*\.jar
+client/guava-11\.0\.2.*\.jar
+client/jsr305-3\.0\.0.*\.jar
+client/hadoop-yarn-client.*\.jar
+client/jackson-jaxrs-1\.9\.13.*\.jar
+client/commons-httpclient-3\.1.*\.jar
+client/commons-collections-3\.2\.[12].*\.jar
+client/netty-all.*\.jar
+client/slf4j-log4j12-1\.7\.10.*\.jar
+client/protobuf-java.*\.jar
+client/jackson-mapper-asl.*\.jar
+client/commons-logging-1\.1\.3.*\.jar
+client/commons-lang-2\.6.*\.jar
 lib
-lib/curator-recipes-2\.7\.1([^.0-9].*)?\.jar
-lib/commons-configuration-1\.6([^.0-9].*)?\.jar
-lib/commons-cli-1\.2([^.0-9].*)?\.jar
-lib/commons-digester-1\.8([^.0-9].*)?\.jar
-lib/curator-client-2\.7\.1([^.0-9].*)?\.jar
-lib/commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
-lib/jsp-api-2\.1([^.0-9].*)?\.jar
-lib/jets3t-0\.9\.0([^.0-9].*)?\.jar
-lib/slf4j-api-1\.7\.10([^.0-9].*)?\.jar
-lib/jaxb-api-2\.2\.2([^.0-9].*)?\.jar
-lib/api-util-1\.0\.0-M20([^.0-9].*)?\.jar
-lib/jettison-1\.1([^.0-9].*)?\.jar
-lib/curator-framework-2\.7\.1([^.0-9].*)?\.jar
-lib/commons-io-2\.4([^.0-9].*)?\.jar
-lib/jetty-util-6\.1\.26([^.0-9].*)?\.jar
-lib/avro-1\.7\.[4-7]([^.0-9].*)?\.jar
-lib/jaxb-impl-2\.2\.3-1([^.0-9].*)?\.jar
-lib/netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-lib/httpcore-4\.2\.5([^.0-9].*)?\.jar
-lib/jsch-0\.1\.(4[2-9]|[5-9]\d)([^.0-9].*)?\.jar
-lib/jersey-core-1\.9([^.0-9].*)?\.jar
-lib/jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-lib/snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
-lib/gson-2\.2\.4([^.0-9].*)?\.jar
-lib/commons-net-3\.1([^.0-9].*)?\.jar
-lib/asm-3\.2([^.0-9].*)?\.jar
-lib/commons-compress-1\.4\.1([^.0-9].*)?\.jar
-lib/mockito-all-1\.8\.5([^.0-9].*)?\.jar
-lib/jackson-xc-1\.9\.13([^.0-9].*)?\.jar
-lib/junit-4\.11([^.0-9].*)?\.jar
-lib/jersey-json-1\.9([^.0-9].*)?\.jar
-lib/xmlenc-0\.52([^.0-9].*)?\.jar
-lib/api-asn1-api-1\.0\.0-M20([^.0-9].*)?\.jar
-lib/commons-codec-1\.4([^.0-9].*)?\.jar
-lib/jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-lib/servlet-api-2\.5([^.0-9].*)?\.jar
-lib/paranamer-2\.3([^.0-9].*)?\.jar
+lib/curator-recipes-2\.7\.1.*\.jar
+lib/commons-configuration-1\.6.*\.jar
+lib/commons-cli-1\.2.*\.jar
+lib/commons-digester-1\.8.*\.jar
+lib/curator-client-2\.7\.1.*\.jar
+lib/commons-beanutils(-core)?-1\.[78]\.0.*\.jar
+lib/jsp-api-2\.1.*\.jar
+lib/jets3t-0\.9\.0.*\.jar
+lib/slf4j-api-1\.7\.10.*\.jar
+lib/jaxb-api-2\.2\.2.*\.jar
+lib/api-util-1\.0\.0-M20.*\.jar
+lib/jettison-1\.1.*\.jar
+lib/curator-framework-2\.7\.1.*\.jar
+lib/commons-io-2\.4.*\.jar
+lib/jetty-util-6\.1\.26.*\.jar
+lib/avro-1\.7\.[4-7].*\.jar
+lib/jaxb-impl-2\.2\.3-1.*\.jar
+lib/netty-3\.6\.2\.Final.*\.jar
+lib/httpcore-4\.2\.5.*\.jar
+lib/jsch-0\.1\.(4[2-9]|[5-9]\d).*\.jar
+lib/jersey-core-1\.9.*\.jar
+lib/jackson-mapper-asl-1\.9\.13.*\.jar
+lib/snappy-java-1\.0\.[45](\.[0-9])?.*\.jar
+lib/gson-2\.2\.4.*\.jar
+lib/commons-net-3\.1.*\.jar
+lib/asm-3\.2.*\.jar
+lib/commons-compress-1\.4\.1.*\.jar
+lib/mockito-all-1\.8\.5.*\.jar
+lib/jackson-xc-1\.9\.13.*\.jar
+lib/junit-4\.11.*\.jar
+lib/jersey-json-1\.9.*\.jar
+lib/xmlenc-0\.52.*\.jar
+lib/api-asn1-api-1\.0\.0-M20.*\.jar
+lib/commons-codec-1\.4.*\.jar
+lib/jackson-core-asl-1\.9\.13.*\.jar
+lib/servlet-api-2\.5.*\.jar
+lib/paranamer-2\.3.*\.jar
 lib/native
 lib/native/libhadoop\.a
 lib/native/libhadoop\.so
@@ -206,26 +205,26 @@ lib/native/libhadoop\.so[.0-9]*
 lib/native/libhadooputils\.a
 lib/native/libsnappy\.so[.0-9]*
 lib/native/libhadooppipes\.a
-lib/jetty-6\.1\.26([^.0-9].*)?\.jar
-lib/jersey-server-1\.9([^.0-9].*)?\.jar
-lib/apacheds-i18n-2\.0\.0-M15([^.0-9].*)?\.jar
-lib/commons-math3-3\.1\.1([^.0-9].*)?\.jar
-lib/log4j-1\.2\.17([^.0-9].*)?\.jar
-lib/hamcrest-core-1\.3([^.0-9].*)?\.jar
-lib/stax-api-1\.0-2([^.0-9].*)?\.jar
-lib/xz-1\.0([^.0-9].*)?\.jar
-lib/zookeeper-3\.4\.6([^.0-9].*)?\.jar
-lib/activation-1\.1([^.0-9].*)?\.jar
-lib/htrace-core-3\.1\.0-incubating([^.0-9].*)?\.jar
-lib/protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-lib/apacheds-kerberos-codec-2\.0\.0-M15([^.0-9].*)?\.jar
-lib/java-xmlbuilder-0\.4([^.0-9].*)?\.jar
-lib/httpclient-4\.2\.5([^.0-9].*)?\.jar
-lib/guava-11\.0\.2([^.0-9].*)?\.jar
-lib/jsr305-3\.0\.0([^.0-9].*)?\.jar
-lib/jackson-jaxrs-1\.9\.13([^.0-9].*)?\.jar
-lib/commons-httpclient-3\.1([^.0-9].*)?\.jar
-lib/commons-collections-3\.2\.[12]([^.0-9].*)?\.jar
-lib/slf4j-log4j12-1\.7\.10([^.0-9].*)?\.jar
-lib/commons-logging-1\.1\.3([^.0-9].*)?\.jar
-lib/commons-lang-2\.6([^.0-9].*)?\.jar
+lib/jetty-6\.1\.26.*\.jar
+lib/jersey-server-1\.9.*\.jar
+lib/apacheds-i18n-2\.0\.0-M15.*\.jar
+lib/commons-math3-3\.1\.1.*\.jar
+lib/log4j-1\.2\.17.*\.jar
+lib/hamcrest-core-1\.3.*\.jar
+lib/stax-api-1\.0-2.*\.jar
+lib/xz-1\.0.*\.jar
+lib/zookeeper-3\.4\.6.*\.jar
+lib/activation-1\.1.*\.jar
+lib/htrace-core-3\.1\.0-incubating.*\.jar
+lib/protobuf-java-2\.5\.0.*\.jar
+lib/apacheds-kerberos-codec-2\.0\.0-M15.*\.jar
+lib/java-xmlbuilder-0\.4.*\.jar
+lib/httpclient-4\.2\.5.*\.jar
+lib/guava-11\.0\.2.*\.jar
+lib/jsr305-3\.0\.0.*\.jar
+lib/jackson-jaxrs-1\.9\.13.*\.jar
+lib/commons-httpclient-3\.1.*\.jar
+lib/commons-collections-3\.2\.[12].*\.jar
+lib/slf4j-log4j12-1\.7\.10.*\.jar
+lib/commons-logging-1\.1\.3.*\.jar
+lib/commons-lang-2\.6.*\.jar
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.list
index 41c171bf..2760a641 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.list
@@ -1,25 +1,25 @@
-netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-leveldbjni-all-1\.8([^.0-9].*)?\.jar
-jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-jersey-server-1\.9([^.0-9].*)?\.jar
-htrace-core-3\.1\.0-incubating([^.0-9].*)?\.jar
-commons-daemon-1\.0\.13([^.0-9].*)?\.jar
-commons-cli-1\.2([^.0-9].*)?\.jar
-log4j-1\.2\.17([^.0-9].*)?\.jar
-jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-guava-11\.0\.2([^.0-9].*)?\.jar
-jetty-6\.1\.26([^.0-9].*)?\.jar
-commons-logging-1\.1\.3([^.0-9].*)?\.jar
-jersey-core-1\.9([^.0-9].*)?\.jar
-asm-3\.2([^.0-9].*)?\.jar
-commons-codec-1\.4([^.0-9].*)?\.jar
-xml-apis-1\.3\.04([^.0-9].*)?\.jar
-xercesImpl-2\.9\.1([^.0-9].*)?\.jar
-xmlenc-0\.52([^.0-9].*)?\.jar
-commons-lang-2\.6([^.0-9].*)?\.jar
-netty-all-4\.0\.23\.Final([^.0-9].*)?\.jar
-jetty-util-6\.1\.26([^.0-9].*)?\.jar
-jsr305-3\.0\.0([^.0-9].*)?\.jar
-protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-commons-io-2\.4([^.0-9].*)?\.jar
-servlet-api-2\.5([^.0-9].*)?\.jar
+netty-3\.6\.2\.Final.*\.jar
+leveldbjni-all-1\.8.*\.jar
+jackson-core-asl-1\.9\.13.*\.jar
+jersey-server-1\.9.*\.jar
+htrace-core-3\.1\.0-incubating.*\.jar
+commons-daemon-1\.0\.13.*\.jar
+commons-cli-1\.2.*\.jar
+log4j-1\.2\.17.*\.jar
+jackson-mapper-asl-1\.9\.13.*\.jar
+guava-11\.0\.2.*\.jar
+jetty-6\.1\.26.*\.jar
+commons-logging-1\.1\.3.*\.jar
+jersey-core-1\.9.*\.jar
+asm-3\.2.*\.jar
+commons-codec-1\.4.*\.jar
+xml-apis-1\.3\.04.*\.jar
+xercesImpl-2\.9\.1.*\.jar
+xmlenc-0\.52.*\.jar
+commons-lang-2\.6.*\.jar
+netty-all-4\.0\.23\.Final.*\.jar
+jetty-util-6\.1\.26.*\.jar
+jsr305-3\.0\.0.*\.jar
+protobuf-java-2\.5\.0.*\.jar
+commons-io-2\.4.*\.jar
+servlet-api-2\.5.*\.jar
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-jar.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-jar.list
index ec23b7c2..16ca0f18 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-jar.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-jar.list
@@ -1,22 +1,22 @@
-netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-leveldbjni-all-1\.8([^.0-9].*)?\.jar
-paranamer-2\.3([^.0-9].*)?\.jar
-jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-jersey-server-1\.9([^.0-9].*)?\.jar
-guice-3\.0([^.0-9].*)?\.jar
-avro-1\.7\.[4-7]([^.0-9].*)?\.jar
-log4j-1\.2\.17([^.0-9].*)?\.jar
-jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
-jersey-core-1\.9([^.0-9].*)?\.jar
-jersey-guice-1\.9([^.0-9].*)?\.jar
-commons-compress-1\.4\.1([^.0-9].*)?\.jar
-junit-4\.11([^.0-9].*)?\.jar
-xz-1\.0([^.0-9].*)?\.jar
-asm-3\.2([^.0-9].*)?\.jar
-aopalliance-1\.0([^.0-9].*)?\.jar
-javax\.inject-1([^.0-9].*)?\.jar
-protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-commons-io-2\.4([^.0-9].*)?\.jar
-hamcrest-core-1\.3([^.0-9].*)?\.jar
-guice-servlet-3\.0([^.0-9].*)?\.jar
+netty-3\.6\.2\.Final.*\.jar
+leveldbjni-all-1\.8.*\.jar
+paranamer-2\.3.*\.jar
+jackson-core-asl-1\.9\.13.*\.jar
+jersey-server-1\.9.*\.jar
+guice-3\.0.*\.jar
+avro-1\.7\.[4-7].*\.jar
+log4j-1\.2\.17.*\.jar
+jackson-mapper-asl-1\.9\.13.*\.jar
+snappy-java-1\.0\.[45](\.[0-9])?.*\.jar
+jersey-core-1\.9.*\.jar
+jersey-guice-1\.9.*\.jar
+commons-compress-1\.4\.1.*\.jar
+junit-4\.11.*\.jar
+xz-1\.0.*\.jar
+asm-3\.2.*\.jar
+aopalliance-1\.0.*\.jar
+javax\.inject-1.*\.jar
+protobuf-java-2\.5\.0.*\.jar
+commons-io-2\.4.*\.jar
+hamcrest-core-1\.3.*\.jar
+guice-servlet-3\.0.*\.jar
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce.list
index 35c9c7f7..cf059083 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce.list
@@ -1,136 +1,123 @@
-azure-storage-2\.0\.0([^.0-9].*)?\.jar
-curator-recipes-2\.7\.1([^.0-9].*)?\.jar
-hadoop-azure([^.0-9].*)?\.jar
-hadoop-mapreduce-client-core([^.0-9].*)?\.jar
-commons-configuration-1\.6([^.0-9].*)?\.jar
+hadoop-mapreduce-client-core\..*jar
 bin
 bin/mapred
 sbin
 sbin/mr-jobhistory-daemon\.sh
-hadoop-ant-2\.7\.[0-9]([^.0-9].*)?\.jar
-commons-cli-1\.2([^.0-9].*)?\.jar
-hadoop-mapreduce-client-common-2\.7\.[0-9]([^.0-9].*)?\.jar
-commons-digester-1\.8([^.0-9].*)?\.jar
-curator-client-2\.7\.1([^.0-9].*)?\.jar
-commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
-jsp-api-2\.1([^.0-9].*)?\.jar
-jets3t-0\.9\.0([^.0-9].*)?\.jar
-hadoop-sls-2\.7\.[0-9]([^.0-9].*)?\.jar
-jackson-core-2\.2\.3([^.0-9].*)?\.jar
-hadoop-mapreduce-client-hs-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-mapreduce-client-jobclient-2\.7\.[0-9]([^.0-9].*)?-tests\.jar
-hadoop-distcp([^.0-9].*)?\.jar
-jaxb-api-2\.2\.2([^.0-9].*)?\.jar
-api-util-1\.0\.0-M20([^.0-9].*)?\.jar
-jettison-1\.1([^.0-9].*)?\.jar
-jackson-databind-2\.2\.3([^.0-9].*)?\.jar
-commons-lang3-3\.3\.2([^.0-9].*)?\.jar
-curator-framework-2\.7\.1([^.0-9].*)?\.jar
-commons-io-2\.4([^.0-9].*)?\.jar
-hadoop-mapreduce-client-hs-plugins([^.0-9].*)?\.jar
-metrics-core-3\.0\.1([^.0-9].*)?\.jar
-hadoop-mapreduce-client-app([^.0-9].*)?\.jar
-aws-java-sdk-1\.7\.4([^.0-9].*)?\.jar
-jetty-util-6\.1\.26([^.0-9].*)?\.jar
-hadoop-aws([^.0-9].*)?\.jar
-avro-1\.7\.[4-7]([^.0-9].*)?\.jar
-jaxb-impl-2\.2\.3-1([^.0-9].*)?\.jar
-hadoop-mapreduce-client-hs([^.0-9].*)?\.jar
-hadoop-mapreduce-client-hs-plugins-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-sls([^.0-9].*)?\.jar
-hadoop-ant([^.0-9].*)?\.jar
-netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-httpcore-4\.2\.5([^.0-9].*)?\.jar
-hadoop-aws-2\.7\.[0-9]([^.0-9].*)?\.jar
-jsch-0\.1\.(4[2-9]|[5-9]\d)([^.0-9].*)?\.jar
-hadoop-mapreduce-client-jobclient([^.0-9].*)?\.jar
-hadoop-archives([^.0-9].*)?\.jar
-jersey-core-1\.9([^.0-9].*)?\.jar
-jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-hadoop-mapreduce-examples-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-mapreduce-client-shuffle-2\.7\.[0-9]([^.0-9].*)?\.jar
-snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
-gson-2\.2\.4([^.0-9].*)?\.jar
-hadoop-gridmix([^.0-9].*)?\.jar
-commons-net-3\.1([^.0-9].*)?\.jar
-asm-3\.2([^.0-9].*)?\.jar
-commons-compress-1\.4\.1([^.0-9].*)?\.jar
-mockito-all-1\.8\.5([^.0-9].*)?\.jar
-hadoop-openstack([^.0-9].*)?\.jar
-jackson-xc-1\.9\.13([^.0-9].*)?\.jar
-junit-4\.11([^.0-9].*)?\.jar
-jersey-json-1\.9([^.0-9].*)?\.jar
-hadoop-distcp-2\.7\.[0-9]([^.0-9].*)?\.jar
-xmlenc-0\.52([^.0-9].*)?\.jar
-api-asn1-api-1\.0\.0-M20([^.0-9].*)?\.jar
-commons-codec-1\.4([^.0-9].*)?\.jar
-jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-servlet-api-2\.5([^.0-9].*)?\.jar
-paranamer-2\.3([^.0-9].*)?\.jar
-joda-time-2\.9\.[2-3]([^.0-9].*)?\.jar
-hadoop-datajoin-2\.7\.[0-9]([^.0-9].*)?\.jar
-jetty-6\.1\.26([^.0-9].*)?\.jar
-jersey-server-1\.9([^.0-9].*)?\.jar
-hadoop-extras-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-mapreduce-client-shuffle([^.0-9].*)?\.jar
-apacheds-i18n-2\.0\.0-M15([^.0-9].*)?\.jar
-hadoop-auth-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-streaming-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-gridmix-2\.7\.[0-9]([^.0-9].*)?\.jar
-commons-math3-3\.1\.1([^.0-9].*)?\.jar
-hadoop-auth([^.0-9].*)?\.jar
-log4j-1\.2\.17([^.0-9].*)?\.jar
-hamcrest-core-1\.3([^.0-9].*)?\.jar
-hadoop-mapreduce-examples([^.0-9].*)?\.jar
-hadoop-extras([^.0-9].*)?\.jar
-stax-api-1\.0-2([^.0-9].*)?\.jar
-hadoop-mapreduce-client-common([^.0-9].*)?\.jar
-xz-1\.0([^.0-9].*)?\.jar
-zookeeper-3\.4\.6([^.0-9].*)?\.jar
-hadoop-archives-2\.7\.[0-9]([^.0-9].*)?\.jar
-activation-1\.1([^.0-9].*)?\.jar
-hadoop-azure-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-mapreduce-client-jobclient-2\.7\.[0-9]([^.0-9].*)?\.jar
-htrace-core-3\.1\.0-incubating([^.0-9].*)?\.jar
-protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-hadoop-mapreduce-client-app-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-datajoin([^.0-9].*)?\.jar
-apacheds-kerberos-codec-2\.0\.0-M15([^.0-9].*)?\.jar
-java-xmlbuilder-0\.4([^.0-9].*)?\.jar
-httpclient-4\.2\.5([^.0-9].*)?\.jar
-hadoop-rumen-2\.7\.[0-9]([^.0-9].*)?\.jar
-hadoop-mapreduce-client-core-2\.7\.[0-9]([^.0-9].*)?\.jar
-guava-11\.0\.2([^.0-9].*)?\.jar
-jsr305-3\.0\.0([^.0-9].*)?\.jar
-hadoop-streaming([^.0-9].*)?\.jar
-hadoop-rumen([^.0-9].*)?\.jar
-jackson-jaxrs-1\.9\.13([^.0-9].*)?\.jar
+hadoop-mapreduce-client-common-2\.7\.[0-9]\..*jar
+commons-digester-1\.8\..*jar
+curator-client-2\.7\.1\..*jar
+commons-beanutils(-core)?-1\.[78]\.0\..*jar
+jsp-api-2\.1\..*jar
+jets3t-0\.9\.0\..*jar
+hadoop-sls-2\.7\.[0-9]\..*jar
+jackson-core-2\.2\.3\..*jar
+hadoop-mapreduce-client-hs-2\.7\.[0-9]\..*jar
+hadoop-mapreduce-client-jobclient-2\.7\.[0-9].*-tests\.jar
+hadoop-distcp\..*jar
+jaxb-api-2\.2\.2\..*jar
+api-util-1\.0\.0-M20\..*jar
+jettison-1\.1\..*jar
+commons-lang3-3\.3\.2\..*jar
+curator-framework-2\.7\.1\..*jar
+commons-io-2\.4\..*jar
+hadoop-mapreduce-client-hs-plugins\..*jar
+metrics-core-3\.0\.1\..*jar
+hadoop-mapreduce-client-app\..*jar
+jetty-util-6\.1\.26\..*jar
+avro-1\.7\.[4-7]\..*jar
+jaxb-impl-2\.2\.3-1\..*jar
+hadoop-mapreduce-client-hs\..*jar
+hadoop-mapreduce-client-hs-plugins-2\.7\.[0-9]\..*jar
+hadoop-sls\..*jar
+hadoop-ant\..*jar
+netty-3\.6\.2\.Final\..*jar
+httpcore-4\.2\.5\..*jar
+jsch-0\.1\.(4[2-9]|[5-9]\d)\..*jar
+hadoop-mapreduce-client-jobclient\..*jar
+hadoop-archives\..*jar
+jersey-core-1\.9\..*jar
+jackson-mapper-asl-1\.9\.13\..*jar
+hadoop-mapreduce-examples-2\.7\.[0-9]\..*jar
+hadoop-mapreduce-client-shuffle-2\.7\.[0-9]\..*jar
+snappy-java-1\.0\.[45](\.[0-9])?\..*jar
+gson-2\.2\.4\..*jar
+hadoop-gridmix\..*jar
+commons-net-3\.1\..*jar
+asm-3\.2\..*jar
+commons-compress-1\.4\.1\..*jar
+mockito-all-1\.8\.5\..*jar
+hadoop-openstack\..*jar
+jackson-xc-1\.9\.13\..*jar
+junit-4\.11\..*jar
+jersey-json-1\.9\..*jar
+hadoop-distcp-2\.7\.[0-9]\..*jar
+xmlenc-0\.52\..*jar
+api-asn1-api-1\.0\.0-M20\..*jar
+commons-codec-1\.4\..*jar
+jackson-core-asl-1\.9\.13\..*jar
+servlet-api-2\.5\..*jar
+paranamer-2\.3\..*jar
+hadoop-datajoin-2\.7\.[0-9]\..*jar
+jetty-6\.1\.26\..*jar
+jersey-server-1\.9\..*jar
+hadoop-extras-2\.7\.[0-9]\..*jar
+hadoop-mapreduce-client-shuffle\..*jar
+apacheds-i18n-2\.0\.0-M15\..*jar
+hadoop-auth-2\.7\.[0-9]\..*jar
+hadoop-streaming-2\.7\.[0-9]\..*jar
+hadoop-gridmix-2\.7\.[0-9]\..*jar
+commons-math3-3\.1\.1\..*jar
+hadoop-auth\..*jar
+log4j-1\.2\.17\..*jar
+hamcrest-core-1\.3\..*jar
+hadoop-mapreduce-examples\..*jar
+hadoop-extras\..*jar
+stax-api-1\.0-2\..*jar
+hadoop-mapreduce-client-common\..*jar
+xz-1\.0\..*jar
+zookeeper-3\.4\.6\..*jar
+hadoop-archives-2\.7\.[0-9]\..*jar
+activation-1\.1\..*jar
+hadoop-mapreduce-client-jobclient-2\.7\.[0-9]\..*jar
+htrace-core-3\.1\.0-incubating\..*jar
+protobuf-java-2\.5\.0\..*jar
+hadoop-mapreduce-client-app-2\.7\.[0-9]\..*jar
+hadoop-datajoin\..*jar
+apacheds-kerberos-codec-2\.0\.0-M15\..*jar
+java-xmlbuilder-0\.4\..*jar
+httpclient-4\.2\.5\..*jar
+hadoop-rumen-2\.7\.[0-9]\..*jar
+hadoop-mapreduce-client-core-2\.7\.[0-9]\..*jar
+guava-11\.0\.2\..*jar
+jsr305-3\.0\.0\..*jar
+hadoop-streaming\..*jar
+hadoop-rumen\..*jar
+jackson-jaxrs-1\.9\.13\..*jar
 lib
-lib/leveldbjni-all-1\.8([^.0-9].*)?\.jar
-lib/commons-io-2\.4([^.0-9].*)?\.jar
-lib/avro-1\.7\.[4-7]([^.0-9].*)?\.jar
-lib/jersey-guice-1\.9([^.0-9].*)?\.jar
-lib/netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-lib/jersey-core-1\.9([^.0-9].*)?\.jar
-lib/jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-lib/snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
-lib/asm-3\.2([^.0-9].*)?\.jar
-lib/commons-compress-1\.4\.1([^.0-9].*)?\.jar
-lib/aopalliance-1\.0([^.0-9].*)?\.jar
-lib/junit-4\.11([^.0-9].*)?\.jar
-lib/jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-lib/paranamer-2\.3([^.0-9].*)?\.jar
-lib/jersey-server-1\.9([^.0-9].*)?\.jar
-lib/log4j-1\.2\.17([^.0-9].*)?\.jar
-lib/hamcrest-core-1\.3([^.0-9].*)?\.jar
-lib/xz-1\.0([^.0-9].*)?\.jar
-lib/javax\.inject-1([^.0-9].*)?\.jar
-lib/protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-lib/guice-3\.0([^.0-9].*)?\.jar
-lib/guice-servlet-3\.0([^.0-9].*)?\.jar
-hadoop-openstack-2\.7\.[0-9]([^.0-9].*)?\.jar
-commons-httpclient-3\.1([^.0-9].*)?\.jar
-commons-collections-3\.2\.[12]([^.0-9].*)?\.jar
-jackson-annotations-2\.2\.3([^.0-9].*)?\.jar
-commons-logging-1\.1\.3([^.0-9].*)?\.jar
-commons-lang-2\.6([^.0-9].*)?\.jar
+lib/leveldbjni-all-1\.8\..*jar
+lib/commons-io-2\.4\..*jar
+lib/avro-1\.7\.[4-7]\..*jar
+lib/jersey-guice-1\.9\..*jar
+lib/netty-3\.6\.2\.Final\..*jar
+lib/jersey-core-1\.9\..*jar
+lib/jackson-mapper-asl-1\.9\.13\..*jar
+lib/snappy-java-1\.0\.[45](\.[0-9])?\..*jar
+lib/asm-3\.2\..*jar
+lib/commons-compress-1\.4\.1\..*jar
+lib/aopalliance-1\.0\..*jar
+lib/junit-4\.11\..*jar
+lib/jackson-core-asl-1\.9\.13\..*jar
+lib/paranamer-2\.3\..*jar
+lib/jersey-server-1\.9\..*jar
+lib/log4j-1\.2\.17\..*jar
+lib/hamcrest-core-1\.3\..*jar
+lib/xz-1\.0\..*jar
+lib/javax\.inject-1\..*jar
+lib/protobuf-java-2\.5\.0\..*jar
+lib/guice-3\.0\..*jar
+lib/guice-servlet-3\.0\..*jar
+hadoop-openstack-2\.7\.[0-9]\..*jar
+commons-httpclient-3\.1\..*jar
+commons-collections-3\.2\.[12]\..*jar
+commons-logging-1\.1\.3\..*jar
+commons-lang-2\.6\..*jar
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-jar.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-jar.list
index 983cec9e..d476cea5 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-jar.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-jar.list
@@ -1,38 +1,38 @@
-netty-3\.6\.2\.Final([^.0-9].*)?\.jar
-leveldbjni-all-1\.8([^.0-9].*)?\.jar
-jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
-jackson-xc-1\.9\.13([^.0-9].*)?\.jar
-jersey-server-1\.9([^.0-9].*)?\.jar
-stax-api-1\.0-2([^.0-9].*)?\.jar
-zookeeper-3\.4\.6([^.0-9].*)?\.jar
-guice-3\.0([^.0-9].*)?\.jar
-jaxb-impl-2\.2\.3-1([^.0-9].*)?\.jar
-zookeeper-3\.4\.6([^.0-9].*)?-tests\.jar
-jersey-client-1\.9([^.0-9].*)?\.jar
-commons-cli-1\.2([^.0-9].*)?\.jar
-log4j-1\.2\.17([^.0-9].*)?\.jar
-jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
-guava-11\.0\.2([^.0-9].*)?\.jar
-jetty-6\.1\.26([^.0-9].*)?\.jar
-commons-logging-1\.1\.3([^.0-9].*)?\.jar
-jersey-core-1\.9([^.0-9].*)?\.jar
-jersey-guice-1\.9([^.0-9].*)?\.jar
-commons-compress-1\.4\.1([^.0-9].*)?\.jar
-jettison-1\.1([^.0-9].*)?\.jar
-commons-collections-3\.2\.[12]([^.0-9].*)?\.jar
-xz-1\.0([^.0-9].*)?\.jar
-asm-3\.2([^.0-9].*)?\.jar
-commons-codec-1\.4([^.0-9].*)?\.jar
-aopalliance-1\.0([^.0-9].*)?\.jar
-javax\.inject-1([^.0-9].*)?\.jar
-commons-lang-2\.6([^.0-9].*)?\.jar
-jetty-util-6\.1\.26([^.0-9].*)?\.jar
-jsr305-3\.0\.0([^.0-9].*)?\.jar
-protobuf-java-2\.5\.0([^.0-9].*)?\.jar
-commons-io-2\.4([^.0-9].*)?\.jar
-activation-1\.1([^.0-9].*)?\.jar
-jersey-json-1\.9([^.0-9].*)?\.jar
-jaxb-api-2\.2\.2([^.0-9].*)?\.jar
-guice-servlet-3\.0([^.0-9].*)?\.jar
-servlet-api-2\.5([^.0-9].*)?\.jar
-jackson-jaxrs-1\.9\.13([^.0-9].*)?\.jar
+netty-3\.6\.2\.Final.*\.jar
+leveldbjni-all-1\.8.*\.jar
+jackson-core-asl-1\.9\.13.*\.jar
+jackson-xc-1\.9\.13.*\.jar
+jersey-server-1\.9.*\.jar
+stax-api-1\.0-2.*\.jar
+zookeeper-3\.4\.6.*\.jar
+guice-3\.0.*\.jar
+jaxb-impl-2\.2\.3-1.*\.jar
+zookeeper-3\.4\.6.*-tests\.jar
+jersey-client-1\.9.*\.jar
+commons-cli-1\.2.*\.jar
+log4j-1\.2\.17.*\.jar
+jackson-mapper-asl-1\.9\.13.*\.jar
+guava-11\.0\.2.*\.jar
+jetty-6\.1\.26.*\.jar
+commons-logging-1\.1\.3.*\.jar
+jersey-core-1\.9.*\.jar
+jersey-guice-1\.9.*\.jar
+commons-compress-1\.4\.1.*\.jar
+jettison-1\.1.*\.jar
+commons-collections-3\.2\.[12].*\.jar
+xz-1\.0.*\.jar
+asm-3\.2.*\.jar
+commons-codec-1\.4.*\.jar
+aopalliance-1\.0.*\.jar
+javax\.inject-1.*\.jar
+commons-lang-2\.6.*\.jar
+jetty-util-6\.1\.26.*\.jar
+jsr305-3\.0\.0.*\.jar
+protobuf-java-2\.5\.0.*\.jar
+commons-io-2\.4.*\.jar
+activation-1\.1.*\.jar
+jersey-json-1\.9.*\.jar
+jaxb-api-2\.2\.2.*\.jar
+guice-servlet-3\.0.*\.jar
+servlet-api-2\.5.*\.jar
+jackson-jaxrs-1\.9\.13.*\.jar