You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by yo...@apache.org on 2018/10/22 12:29:33 UTC
incubator-omid git commit: OMID-119 - generate different jar names
for hbase1 and hbase 2
Repository: incubator-omid
Updated Branches:
refs/heads/phoenix-integration 078dedc52 -> 350ad2733
OMID-119 - generate different jar names for hbase1 and hbase 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/350ad273
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/350ad273
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/350ad273
Branch: refs/heads/phoenix-integration
Commit: 350ad2733108d67c4267aa288fd0f84bfc20bd69
Parents: 078dedc
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Mon Oct 22 10:44:54 2018 +0300
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Mon Oct 22 15:28:50 2018 +0300
----------------------------------------------------------------------
benchmarks/pom.xml | 6 +++++-
examples/pom.xml | 12 +++++-------
hbase-client/pom.xml | 12 +++++++++---
hbase-commit-table/pom.xml | 4 ++--
hbase-common/pom.xml | 2 +-
hbase-coprocessor/pom.xml | 6 +++---
hbase-tools/pom.xml | 4 ++--
pom.xml | 14 +++++++++++++-
timestamp-storage/pom.xml | 2 +-
tso-server/pom.xml | 30 ++++++++++++++++--------------
10 files changed, 57 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index fe89c9b..0056978 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,13 +22,17 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.omid</groupId>
<artifactId>${shims.exclude.artifactId}</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>omid-hbase-common-${hbase.exlude.shims.concatination}</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index b5ed5c0..afd85da 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -19,13 +19,17 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client</artifactId>
+ <artifactId>omid-hbase-client-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.omid</groupId>
<artifactId>${shims.exclude.artifactId}</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>omid-hbase-commit-table-${hbase.exlude.shims.concatination}</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -48,12 +52,6 @@
<version>${log4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 040c815..968329d 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -8,7 +8,7 @@
<version>0.9.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-client</artifactId>
+ <artifactId>omid-hbase-client-${hbase.shims.concatination}</artifactId>
<packaging>jar</packaging>
<name>HBase Client</name>
<description>HBase specific implementation of transaction-client module</description>
@@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-tools</artifactId>
+ <artifactId>omid-hbase-tools-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -117,6 +117,12 @@
<groupId>org.apache.omid</groupId>
<artifactId>${shims.artifactId}</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.exclude.artifactId}</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- end testing -->
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 73f50ea..f192569 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -8,7 +8,7 @@
<version>0.9.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table-${hbase.shims.concatination}</artifactId>
<packaging>jar</packaging>
<name>HBase Commit Table</name>
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common</artifactId>
+ <artifactId>omid-hbase-common-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index ffc94c8..266e014 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -8,7 +8,7 @@
<version>0.9.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-common</artifactId>
+ <artifactId>omid-hbase-common-${hbase.shims.concatination}</artifactId>
<name>HBase Common</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 01dfced..a93508f 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -8,7 +8,7 @@
<version>0.9.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-coprocessor</artifactId>
+ <artifactId>omid-hbase-coprocessor-${hbase.shims.concatination}</artifactId>
<packaging>jar</packaging>
<name>HBase Coprocessors</name>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client</artifactId>
+ <artifactId>omid-hbase-client-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index fe6858e..5a4c562 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -8,7 +8,7 @@
<version>0.9.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-tools</artifactId>
+ <artifactId>omid-hbase-tools-${hbase.shims.concatination}</artifactId>
<name>HBase tools</name>
<packaging>jar</packaging>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cbcaf38..f7f6ff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -20,6 +21,12 @@
<url>http://www.apache.org</url>
</organization>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ </parent>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -181,7 +188,7 @@
<harmless.groupId>org.apache.hbase</harmless.groupId>
<harmless.artifactId>hbase-client</harmless.artifactId>
<harmless.version>${hbase.version}</harmless.version>
-
+ <additionalparam>-Xdoclint:none</additionalparam>
</properties>
<build>
@@ -558,6 +565,8 @@
<hadoop.version>${hadoop1.version}</hadoop.version>
<hbase.version>${hbase1.version}</hbase.version>
<shims.module>hbase-1</shims.module>
+ <hbase.shims.concatination>hbase1.3</hbase.shims.concatination>
+ <hbase.exlude.shims.concatination>hbase2.0</hbase.exlude.shims.concatination>
</properties>
</profile>
@@ -571,6 +580,9 @@
<java.version>1.8</java.version>
<hadoop.version>${hadoop2.version}</hadoop.version>
<hbase.version>${hbase2.version}</hbase.version>
+ <hbase.shims.concatination>hbase2.0</hbase.shims.concatination>
+ <hbase.exlude.shims.concatination>hbase1.3</hbase.exlude.shims.concatination>
+
</properties>
</profile>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index e810b0f..5d87b10 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common</artifactId>
+ <artifactId>omid-hbase-common-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/350ad273/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 5605ca6..1a64a91 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -21,17 +21,11 @@
<groupId>org.apache.omid</groupId>
<artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.exclude.artifactId}</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common</artifactId>
+ <artifactId>omid-hbase-common-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
@@ -43,13 +37,17 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.omid</groupId>
<artifactId>${shims.exclude.artifactId}</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>omid-hbase-common-${hbase.exlude.shims.concatination}</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -63,6 +61,10 @@
<groupId>org.apache.omid</groupId>
<artifactId>${shims.exclude.artifactId}</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>omid-hbase-common-${hbase.exlude.shims.concatination}</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -81,7 +83,7 @@
The hbase tools are handy to create the required Omid tables from the same script that starts the TSO server -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-tools</artifactId>
+ <artifactId>omid-hbase-tools-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -226,11 +228,11 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.omid</groupId>-->
+ <!--<artifactId>${shims.artifactId}</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
<!-- end testing -->
</dependencies>