HDFS-13407. Ozone: Use separated version schema for Hdds/Ozone projects. Contributed by Elek Marton.
diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching
index df043dd..6557161 100755
--- a/dev-support/bin/dist-layout-stitching
+++ b/dev-support/bin/dist-layout-stitching
@@ -21,6 +21,9 @@
# project.build.directory
BASEDIR=$2
+#hdds.version
+HDDS_VERSION=$3
+
function run()
{
declare res
@@ -144,19 +147,19 @@
run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop-client-minicluster-${VERSION}.jar" share/hadoop/client/
# HDDS
-run copy "${ROOT}/hadoop-hdds/common/target/hadoop-hdds-common-${VERSION}" .
-run copy "${ROOT}/hadoop-hdds/framework/target/hadoop-hdds-server-framework-${VERSION}" .
-run copy "${ROOT}/hadoop-hdds/server-scm/target/hadoop-hdds-server-scm-${VERSION}" .
-run copy "${ROOT}/hadoop-hdds/container-service/target/hadoop-hdds-container-service-${VERSION}" .
-run copy "${ROOT}/hadoop-hdds/client/target/hadoop-hdds-client-${VERSION}" .
-run copy "${ROOT}/hadoop-hdds/tools/target/hadoop-hdds-tools-${VERSION}" .
+run copy "${ROOT}/hadoop-hdds/common/target/hadoop-hdds-common-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-hdds/framework/target/hadoop-hdds-server-framework-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-hdds/server-scm/target/hadoop-hdds-server-scm-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-hdds/container-service/target/hadoop-hdds-container-service-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-hdds/client/target/hadoop-hdds-client-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-hdds/tools/target/hadoop-hdds-tools-${HDDS_VERSION}" .
# Ozone
-run copy "${ROOT}/hadoop-ozone/common/target/hadoop-ozone-common-${VERSION}" .
-run copy "${ROOT}/hadoop-ozone/ozone-manager/target/hadoop-ozone-ozone-manager-${VERSION}" .
-run copy "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore-service-${VERSION}" .
-run copy "${ROOT}/hadoop-ozone/client/target/hadoop-ozone-client-${VERSION}" .
-run copy "${ROOT}/hadoop-ozone/tools/target/hadoop-ozone-tools-${VERSION}" .
+run copy "${ROOT}/hadoop-ozone/common/target/hadoop-ozone-common-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-ozone/ozone-manager/target/hadoop-ozone-ozone-manager-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore-service-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-ozone/client/target/hadoop-ozone-client-${HDDS_VERSION}" .
+run copy "${ROOT}/hadoop-ozone/tools/target/hadoop-ozone-tools-${HDDS_VERSION}" .
run copy "${ROOT}/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${VERSION}" .
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 48e6673..f9b8573 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 95ff09a..d2efec4 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/pom.xml
@@ -20,10 +20,10 @@
<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 6b2a156..b81da96 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -20,10 +20,10 @@
<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 f09f03d..3dc8470 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -20,10 +20,10 @@
<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 a234b8e..959bf4d 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -20,10 +20,10 @@
<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 01b696c..f12d3be 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -25,7 +25,7 @@
</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 f742a00..fd927d8 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -20,10 +20,10 @@
<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 b2823ef..28250fa 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -20,11 +20,11 @@
<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 b1eb587..fae630f 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -20,10 +20,10 @@
<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 7f51732..6ddba0f 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -20,10 +20,10 @@
<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 89bf928..95f243b 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -20,10 +20,10 @@
<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 8cfe037..43da657 100644
--- a/hadoop-ozone/objectstore-service/pom.xml
+++ b/hadoop-ozone/objectstore-service/pom.xml
@@ -20,10 +20,10 @@
<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 9b8f42c..7f61129 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -20,10 +20,10 @@
<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 40c50be..e92b288 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -24,7 +24,7 @@
<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 573afcf..918a675 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -20,10 +20,10 @@
<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 4e76f4b..b8c2884 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -561,63 +561,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>
@@ -625,32 +625,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 52d9d4a..3e6c3f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,9 @@
<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>
