Fix handling of SNAPSHOT versions.

When looking at version strings maven will only look for -SNAPSHOT as the last
part of the version.
	Change on 2015/06/24 by angusdavis <angusdavis@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=96834295

Author: angusdavis

bigquery/bigquery-hadoop1.pom.xml

@@ -30,7 +30,7 @@
   <description>
     Hadoop 2 MapReduce input and output formats for use with BigQuery
   </description>
-  <version>0.7.1-SNAPSHOT-hadoop1</version>
+  <version>0.7.1-hadoop1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
@@ -45,17 +45,17 @@
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>util-hadoop</artifactId>
-      <version>${bigdataoss.util-hadoop.version}-hadoop1</version>
+      <version>${bigdataoss.util-hadoop.one.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>gcs-connector</artifactId>
-      <version>${bigdataoss.gcs.version}-hadoop1</version>
+      <version>${bigdataoss.gcs.hadoop.one.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>gcs-connector</artifactId>
-      <version>${bigdataoss.gcs.version}-hadoop1</version>
+      <version>${bigdataoss.gcs.hadoop.one.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>

bigquery/bigquery-hadoop2.pom.xml

@@ -30,7 +30,7 @@
   <description>
     Hadoop 2 MapReduce input and output formats for use with BigQuery
   </description>
-  <version>0.7.1-SNAPSHOT-hadoop2</version>
+  <version>0.7.1-hadoop2-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
@@ -49,17 +49,17 @@
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>util-hadoop</artifactId>
-      <version>${bigdataoss.util-hadoop.version}-hadoop2</version>
+      <version>${bigdataoss.util-hadoop.two.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>gcs-connector</artifactId>
-      <version>${bigdataoss.gcs.version}-hadoop2</version>
+      <version>${bigdataoss.gcs.hadoop.two.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>gcs-connector</artifactId>
-      <version>${bigdataoss.gcs.version}-hadoop2</version>
+      <version>${bigdataoss.gcs.hadoop.two.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>

gcs/gcs-hadoop1.pom.xml

@@ -30,7 +30,7 @@
   <description>
     An implementation of org.apache.hadoop.fs.FileSystem targeting Google Cloud Storage
   </description>
-  <version>1.4.1-SNAPSHOT-hadoop1</version>
+  <version>1.4.1-hadoop1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>util-hadoop</artifactId>
-      <version>${bigdataoss.util-hadoop.version}-hadoop1</version>
+      <version>${bigdataoss.util-hadoop.one.version}</version>
     </dependency>
   </dependencies>
 

gcs/gcs-hadoop2.pom.xml

@@ -30,7 +30,7 @@
   <description>
     An implementation of org.apache.hadoop.fs.FileSystem targeting Google Cloud Storage
   </description>
-  <version>1.4.1-SNAPSHOT-hadoop2</version>
+  <version>1.4.1-hadoop2-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>util-hadoop</artifactId>
-      <version>${bigdataoss.util-hadoop.version}-hadoop2</version>
+      <version>${bigdataoss.util-hadoop.two.version}</version>
     </dependency>
   </dependencies>
 

pom.xml

@@ -71,9 +71,11 @@
 
   <properties>
     <bigdataoss.util.version>1.4.1-SNAPSHOT</bigdataoss.util.version>
-    <bigdataoss.util-hadoop.version>1.4.1-SNAPSHOT</bigdataoss.util-hadoop.version>
-    <bigdataoss.gcs.version>1.4.1-SNAPSHOT</bigdataoss.gcs.version>
     <bigdataoss.gcsio.version>1.4.1-SNAPSHOT</bigdataoss.gcsio.version>
+    <bigdataoss.util-hadoop.one.version>1.4.1-hadoop1-SNAPSHOT</bigdataoss.util-hadoop.one.version>
+    <bigdataoss.util-hadoop.two.version>1.4.1-hadoop2-SNAPSHOT</bigdataoss.util-hadoop.two.version>
+    <bigdataoss.gcs.hadoop.one.version>1.4.1-hadoop1-SNAPSHOT</bigdataoss.gcs.hadoop.one.version>
+    <bigdataoss.gcs.hadoop.two.version>1.4.1-hadoop2-SNAPSHOT</bigdataoss.gcs.hadoop.two.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <google.api.version>1.19.0</google.api.version>
     <google.guava.version>18.0</google.guava.version>

util-hadoop/util-hadoop-hadoop1.pom.xml

@@ -26,7 +26,7 @@
 
   <packaging>jar</packaging>
   <artifactId>util-hadoop</artifactId>
-  <version>1.4.1-SNAPSHOT-hadoop1</version>
+  <version>1.4.1-hadoop1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

util-hadoop/util-hadoop-hadoop2.pom.xml

@@ -26,7 +26,7 @@
 
   <packaging>jar</packaging>
   <artifactId>util-hadoop</artifactId>
-  <version>1.4.1-SNAPSHOT-hadoop2</version>
+  <version>1.4.1-hadoop2-SNAPSHOT</version>
 
   <dependencies>
     <dependency>