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

This commit is contained in:
Xiaoyu Yao 2018-04-16 16:17:52 -07:00 committed by Owen O'Malley
parent 17974ba3a6
commit 20dab05564
17 changed files with 46 additions and 42 deletions

View File

@ -174,6 +174,7 @@
<argument>${basedir}/../dev-support/bin/dist-layout-stitching</argument> <argument>${basedir}/../dev-support/bin/dist-layout-stitching</argument>
<argument>${project.version}</argument> <argument>${project.version}</argument>
<argument>${project.build.directory}</argument> <argument>${project.build.directory}</argument>
<argument>${hdds.version}</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds</artifactId> <artifactId>hadoop-hdds</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-hdds-client</artifactId> <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> <description>Apache Hadoop Distributed Data Store Client libraries</description>
<name>Apache HDDS Client</name> <name>Apache HDDS Client</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds</artifactId> <artifactId>hadoop-hdds</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-hdds-common</artifactId> <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> <description>Apache Hadoop Distributed Data Store Common</description>
<name>Apache HDDS Common</name> <name>Apache HDDS Common</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds</artifactId> <artifactId>hadoop-hdds</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-hdds-container-service</artifactId> <artifactId>hadoop-hdds-container-service</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache HDDS Container server</description> <description>Apache HDDS Container server</description>
<name>Apache HDDS Container server</name> <name>Apache HDDS Container server</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds</artifactId> <artifactId>hadoop-hdds</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-hdds-server-framework</artifactId> <artifactId>hadoop-hdds-server-framework</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache HDDS server framework</description> <description>Apache HDDS server framework</description>
<name>Apache HDDS Server Common</name> <name>Apache HDDS Server Common</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -25,7 +25,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
</parent> </parent>
<artifactId>hadoop-hdds</artifactId> <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> <description>Apache Hadoop Distributed Data Store Parent project</description>
<name>Apache Hdds</name> <name>Apache Hdds</name>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds</artifactId> <artifactId>hadoop-hdds</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-hdds-server-scm</artifactId> <artifactId>hadoop-hdds-server-scm</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache HDDS SCM server</description> <description>Apache HDDS SCM server</description>
<name>Apache Hadoop HDDS SCM server</name> <name>Apache Hadoop HDDS SCM server</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,11 +20,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds</artifactId> <artifactId>hadoop-hdds</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-hdds-tools</artifactId> <artifactId>hadoop-hdds-tools</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache HDDS Tools</description> <description>Apache HDDS Tools</description>
<name>Apache Hadoop HDDS tools</name> <name>Apache Hadoop HDDS tools</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-ozone-client</artifactId> <artifactId>hadoop-ozone-client</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache Hadoop Ozone Client</description> <description>Apache Hadoop Ozone Client</description>
<name>Apache Hadoop Ozone Client</name> <name>Apache Hadoop Ozone Client</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-ozone-common</artifactId> <artifactId>hadoop-ozone-common</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache Hadoop Ozone Common libraris</description> <description>Apache Hadoop Ozone Common libraris</description>
<name>Apache Hadoop Ozone Common</name> <name>Apache Hadoop Ozone Common</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-ozone-integration-test</artifactId> <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> <description>Apache Hadoop Ozone Integration test package</description>
<name>Apache Hadoop Ozone integration tests</name> <name>Apache Hadoop Ozone integration tests</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-ozone-objectstore-service</artifactId> <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> <description>Apache Hadoop Ozone Object Store REST Service</description>
<name>Apache Hadoop Ozone Object Store REST Service</name> <name>Apache Hadoop Ozone Object Store REST Service</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-ozone-ozone-manager</artifactId> <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> <description>Apache Hadoop Ozone OM server</description>
<name>Apache Hadoop Ozone OM server</name> <name>Apache Hadoop Ozone OM server</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -24,7 +24,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<relativePath>../hadoop-project-dist</relativePath> <relativePath>../hadoop-project-dist</relativePath>
</parent> </parent>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache Hadoop Ozone parent project</description> <description>Apache Hadoop Ozone parent project</description>
<name>Apache Hadoop Ozone</name> <name>Apache Hadoop Ozone</name>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@ -20,10 +20,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>hadoop-ozone-tools</artifactId> <artifactId>hadoop-ozone-tools</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>0.2.1-SNAPSHOT</version>
<description>Apache Hadoop Ozone Tools</description> <description>Apache Hadoop Ozone Tools</description>
<name>Apache Hadoop Ozone Tools</name> <name>Apache Hadoop Ozone Tools</name>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -559,63 +559,63 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone</artifactId> <artifactId>hadoop-ozone</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-objectstore-service</artifactId> <artifactId>hadoop-ozone-objectstore-service</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-common</artifactId> <artifactId>hadoop-hdds-common</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-client</artifactId> <artifactId>hadoop-hdds-client</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-tools</artifactId> <artifactId>hadoop-hdds-tools</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-tools</artifactId> <artifactId>hadoop-ozone-tools</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-integration-test</artifactId> <artifactId>hadoop-ozone-integration-test</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-server-framework</artifactId> <artifactId>hadoop-hdds-server-framework</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-server-scm</artifactId> <artifactId>hadoop-hdds-server-scm</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-container-service</artifactId> <artifactId>hadoop-hdds-container-service</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-container-service</artifactId> <artifactId>hadoop-hdds-container-service</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
@ -623,32 +623,32 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-server-scm</artifactId> <artifactId>hadoop-hdds-server-scm</artifactId>
<type>test-jar</type> <type>test-jar</type>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-common</artifactId> <artifactId>hadoop-ozone-common</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-ozone-manager</artifactId> <artifactId>hadoop-ozone-ozone-manager</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-ozone-manager</artifactId> <artifactId>hadoop-ozone-ozone-manager</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-client</artifactId> <artifactId>hadoop-ozone-client</artifactId>
<version>${project.version}</version> <version>${hdds.version}</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -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> <dependency-check-maven.version>1.4.3</dependency-check-maven.version>
<shell-executable>bash</shell-executable> <shell-executable>bash</shell-executable>
<!-- version for hdds/ozone components -->
<hdds.version>0.2.1-SNAPSHOT</hdds.version>
</properties> </properties>
<modules> <modules>