From 20dab055641a11ffae8e96ea6ef27b9133fa63b7 Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Mon, 16 Apr 2018 16:17:52 -0700 Subject: [PATCH] HDFS-13407. Ozone: Use separated version schema for Hdds/Ozone projects. Contributed by Elek Marton. --- hadoop-dist/pom.xml | 1 + hadoop-hdds/client/pom.xml | 4 +-- hadoop-hdds/common/pom.xml | 4 +-- hadoop-hdds/container-service/pom.xml | 4 +-- hadoop-hdds/framework/pom.xml | 4 +-- hadoop-hdds/pom.xml | 2 +- hadoop-hdds/server-scm/pom.xml | 4 +-- hadoop-hdds/tools/pom.xml | 4 +-- hadoop-ozone/client/pom.xml | 4 +-- hadoop-ozone/common/pom.xml | 4 +-- hadoop-ozone/integration-test/pom.xml | 4 +-- hadoop-ozone/objectstore-service/pom.xml | 4 +-- hadoop-ozone/ozone-manager/pom.xml | 4 +-- hadoop-ozone/pom.xml | 2 +- hadoop-ozone/tools/pom.xml | 4 +-- hadoop-project/pom.xml | 32 ++++++++++++------------ pom.xml | 3 +++ 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 @@ ${basedir}/../dev-support/bin/dist-layout-stitching ${project.version} ${project.build.directory} + ${hdds.version} 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"> org.apache.hadoop hadoop-hdds - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-hdds-client - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Distributed Data Store Client libraries Apache HDDS Client jar 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"> org.apache.hadoop hadoop-hdds - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-hdds-common - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Distributed Data Store Common Apache HDDS Common jar 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"> org.apache.hadoop hadoop-hdds - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-hdds-container-service - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache HDDS Container server Apache HDDS Container server jar 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"> org.apache.hadoop hadoop-hdds - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-hdds-server-framework - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache HDDS server framework Apache HDDS Server Common jar 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"> hadoop-hdds - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Distributed Data Store Parent project Apache Hdds pom 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"> org.apache.hadoop hadoop-hdds - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-hdds-server-scm - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache HDDS SCM server Apache Hadoop HDDS SCM server jar 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"> org.apache.hadoop hadoop-hdds - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-hdds-tools - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache HDDS Tools Apache Hadoop HDDS tools jar 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"> org.apache.hadoop hadoop-ozone - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-ozone-client - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Ozone Client Apache Hadoop Ozone Client jar 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"> org.apache.hadoop hadoop-ozone - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-ozone-common - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Ozone Common libraris Apache Hadoop Ozone Common jar 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"> org.apache.hadoop hadoop-ozone - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-ozone-integration-test - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Ozone Integration test package Apache Hadoop Ozone integration tests jar 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"> org.apache.hadoop hadoop-ozone - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-ozone-objectstore-service - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Ozone Object Store REST Service Apache Hadoop Ozone Object Store REST Service jar 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"> org.apache.hadoop hadoop-ozone - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-ozone-ozone-manager - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Ozone OM server Apache Hadoop Ozone OM server jar 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"> ../hadoop-project-dist hadoop-ozone - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Ozone parent project Apache Hadoop Ozone pom 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"> org.apache.hadoop hadoop-ozone - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT hadoop-ozone-tools - 3.2.0-SNAPSHOT + 0.2.1-SNAPSHOT Apache Hadoop Ozone Tools Apache Hadoop Ozone Tools jar 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 @@ org.apache.hadoop hadoop-ozone - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-ozone-objectstore-service - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-hdds-common - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-hdds-client - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-hdds-tools - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-ozone-tools - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-ozone-integration-test - ${project.version} + ${hdds.version} test-jar org.apache.hadoop hadoop-hdds-server-framework - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-hdds-server-scm - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-hdds-container-service - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-hdds-container-service - ${project.version} + ${hdds.version} test-jar @@ -623,32 +623,32 @@ org.apache.hadoop hadoop-hdds-server-scm test-jar - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-ozone-common - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-ozone-ozone-manager - ${project.version} + ${hdds.version} org.apache.hadoop hadoop-ozone-ozone-manager - ${project.version} + ${hdds.version} test-jar org.apache.hadoop hadoop-ozone-client - ${project.version} + ${hdds.version} 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 1.4.3 bash + + + 0.2.1-SNAPSHOT