Also enable '_' as a version identifer prefix

(cherry picked from commit 228be5ef50bd9c92e10f39067182fcbcc13d2088)

2 files changed, 36 insertions, 36 deletions

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 eea1876e..280c6e53 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
@@ -5,14 +5,14 @@ sbin
 sbin/hadoop-daemons\.sh
 sbin/hadoop-daemon\.sh
 sbin/slaves\.sh
-hadoop-annotations-2\.7\.[0-9][\.\-].*jar
-hadoop-common-2\.7\.[0-9][\.\-].*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\..*jar
-hadoop-auth-2\.7\.[0-9][\.\-].*jar
+hadoop-auth-2\.7\.[0-9][\.\-_].*jar
 libexec
 libexec/hdfs-config\.sh
 libexec/hadoop-layout\.sh
@@ -22,7 +22,7 @@ libexec/hadoop-config\.sh
 libexec/init-hdfs\.sh
 hadoop-auth\..*jar
 hadoop-nfs\..*jar
-hadoop-nfs-2\.7\.[0-9][\.\-].*jar
+hadoop-nfs-2\.7\.[0-9][\.\-_].*jar
 client
 client/curator-recipes\..*jar
 client/curator-recipes-2\.7\.1\..*jar
@@ -33,7 +33,7 @@ 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/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
@@ -41,7 +41,7 @@ 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/hadoop-annotations-2\.7\.[0-9][\.\-_].*jar
 client/jersey-core\..*jar
 client/commons-compress\..*jar
 client/stax-api\..*jar
@@ -66,9 +66,9 @@ 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/hadoop-common-2\.7\.[0-9][\.\-_].*jar
 client/commons-math3\..*jar
-client/hadoop-yarn-common-2\.7\.[0-9][\.\-].*jar
+client/hadoop-yarn-common-2\.7\.[0-9][\.\-_].*jar
 client/hadoop-annotations\..*jar
 client/xercesImpl\..*jar
 client/commons-codec\..*jar
@@ -83,16 +83,16 @@ 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/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-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/snappy-java-1\.0\.[45](\.[0-9])?[\.\-_].*jar
 client/gson-2\.2\.4\..*jar
 client/commons-net-3\.1\..*jar
 client/api-util\..*jar
@@ -108,11 +108,11 @@ 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-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/hadoop-auth-2\.7\.[0-9][\.\-_].*jar
 client/snappy-java\..*jar
 client/gson\..*jar
 client/xml-apis-1\.3\.04\..*jar
@@ -122,28 +122,28 @@ 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/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/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/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/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/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
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 3121b091..22faf89a 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
@@ -3,15 +3,15 @@ bin
 bin/mapred
 sbin
 sbin/mr-jobhistory-daemon\.sh
-hadoop-mapreduce-client-common-2\.7\.[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
+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-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
@@ -27,7 +27,7 @@ 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-mapreduce-client-hs-plugins-2\.7\.[0-9][\.\-_].*jar
 hadoop-sls\..*jar
 hadoop-ant\..*jar
 netty-3\.6\.2\.Final\..*jar
@@ -37,8 +37,8 @@ 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
+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
@@ -50,22 +50,22 @@ 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
+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
+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-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
+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
@@ -76,18 +76,18 @@ 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
+hadoop-archives-2\.7\.[0-9][\.\-_].*jar
 activation-1\.1\..*jar
-hadoop-mapreduce-client-jobclient-2\.7\.[0-9][\.\-].*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-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
+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
@@ -116,7 +116,7 @@ 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
+hadoop-openstack-2\.7\.[0-9][\.\-_].*jar
 commons-httpclient-3\.1\..*jar
 commons-collections-3\.2\.[12]\..*jar
 commons-logging-1\.1\.3\..*jar