HDFS-13407. Ozone: Use separated version schema for Hdds/Ozone projects. Contributed by Elek Marton.

17 files changed, 46 insertions, 42 deletions

diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 48e66734e5..f9b8573d80 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -174,6 +174,7 @@
                     <argument>${basedir}/../dev-support/bin/dist-layout-stitching</argument>
                     <argument>${project.version}</argument>
                     <argument>${project.build.directory}</argument>
+                    <argument>${hdds.version}</argument>
                   </arguments>
                 </configuration>
               </execution>
diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml
index 95ff09abb0..d2efec497a 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-hdds</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-hdds-client</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Distributed Data Store Client libraries</description>
   <name>Apache HDDS Client</name>
   <packaging>jar</packaging>
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index 6b2a156a15..b81da96080 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-hdds</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-hdds-common</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Distributed Data Store Common</description>
   <name>Apache HDDS Common</name>
   <packaging>jar</packaging>
diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml
index f09f03d3fd..3dc84706ce 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-hdds</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-hdds-container-service</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache HDDS Container server</description>
   <name>Apache HDDS Container server</name>
   <packaging>jar</packaging>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index a234b8e32d..959bf4dd31 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-hdds</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-hdds-server-framework</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache HDDS server framework</description>
   <name>Apache HDDS Server Common</name>
   <packaging>jar</packaging>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 01b696cec0..f12d3be0af 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -25,7 +25,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   </parent>
 
   <artifactId>hadoop-hdds</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Distributed Data Store Parent project</description>
   <name>Apache Hdds</name>
   <packaging>pom</packaging>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index f742a00b1c..fd927d8d6a 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-hdds</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-hdds-server-scm</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache HDDS SCM server</description>
   <name>Apache Hadoop HDDS SCM server</name>
   <packaging>jar</packaging>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index b2823ef180..28250fa028 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -20,11 +20,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-hdds</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>hadoop-hdds-tools</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache HDDS Tools</description>
   <name>Apache Hadoop HDDS tools</name>
   <packaging>jar</packaging>
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index b1eb587c63..fae630f544 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-ozone</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-ozone-client</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Ozone Client</description>
   <name>Apache Hadoop Ozone Client</name>
   <packaging>jar</packaging>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 7f51732242..6ddba0fb9c 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-ozone</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-ozone-common</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Ozone Common libraris</description>
   <name>Apache Hadoop Ozone Common</name>
   <packaging>jar</packaging>
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 89bf928142..95f243ba20 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-ozone</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-ozone-integration-test</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Ozone Integration test package</description>
   <name>Apache Hadoop Ozone integration tests</name>
   <packaging>jar</packaging>
diff --git a/hadoop-ozone/objectstore-service/pom.xml b/hadoop-ozone/objectstore-service/pom.xml
index 8cfe037820..43da657af6 100644
--- a/hadoop-ozone/objectstore-service/pom.xml
+++ b/hadoop-ozone/objectstore-service/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-ozone</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-ozone-objectstore-service</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Ozone Object Store REST Service</description>
   <name>Apache Hadoop Ozone Object Store REST Service</name>
   <packaging>jar</packaging>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 9b8f42c143..7f611293bc 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-ozone</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-ozone-ozone-manager</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Ozone OM server</description>
   <name>Apache Hadoop Ozone OM server</name>
   <packaging>jar</packaging>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 40c50becf8..e92b288fcf 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -24,7 +24,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <relativePath>../hadoop-project-dist</relativePath>
   </parent>
   <artifactId>hadoop-ozone</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Ozone parent project</description>
   <name>Apache Hadoop Ozone</name>
   <packaging>pom</packaging>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 573afcff43..918a675b0f 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-ozone</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-ozone-tools</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>0.2.1-SNAPSHOT</version>
   <description>Apache Hadoop Ozone Tools</description>
   <name>Apache Hadoop Ozone Tools</name>
   <packaging>jar</packaging>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index cbe43b4acb..ff519e9639 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -559,63 +559,63 @@
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-objectstore-service</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-common</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-client</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-tools</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-tools</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-integration-test</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
         <type>test-jar</type>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-server-framework</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-server-scm</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-container-service</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-container-service</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
         <type>test-jar</type>
       </dependency>
 
@@ -623,32 +623,32 @@
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-server-scm</artifactId>
         <type>test-jar</type>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
 
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-common</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-ozone-manager</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-ozone-manager</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
         <type>test-jar</type>
       </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-client</artifactId>
-        <version>${project.version}</version>
+        <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
diff --git a/pom.xml b/pom.xml
index 52d9d4a6e3..3e6c3f9377 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <dependency-check-maven.version>1.4.3</dependency-check-maven.version>
 
     <shell-executable>bash</shell-executable>
+
+    <!-- version for hdds/ozone components -->
+    <hdds.version>0.2.1-SNAPSHOT</hdds.version>
   </properties>
 
   <modules>