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/12/03 13:46:37 UTC
[42/50] [abbrv] incubator-omid git commit: tso jar also with hbase1-2
naming
tso jar also with hbase1-2 naming
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/593eafe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/593eafe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/593eafe9
Branch: refs/heads/master
Commit: 593eafe9f3cde869c79a9a09ab4aed13f16c6916
Parents: 1c48d3b
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Mon Oct 22 21:14:28 2018 +0300
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Tue Nov 13 10:11:39 2018 +0200
----------------------------------------------------------------------
hbase-client/pom.xml | 14 ++++++++++++--
hbase-commit-table/pom.xml | 6 ++++++
hbase-coprocessor/pom.xml | 25 +++++++++++++++++++++++--
hbase-tools/pom.xml | 20 ++++++++++++++++++++
timestamp-storage/pom.xml | 6 ++++++
tso-server/pom.xml | 2 +-
6 files changed, 68 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/593eafe9/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index c39a368..3d5b11d 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -40,16 +40,26 @@
<groupId>org.apache.omid</groupId>
<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>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server</artifactId>
+ <artifactId>omid-tso-server-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server</artifactId>
+ <artifactId>omid-tso-server-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/593eafe9/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index a3ff993..c94be1d 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -44,6 +44,12 @@
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-common-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.exclude.artifactId}</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- End of Dependencies on Omid modules -->
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/593eafe9/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index ab9505a..55500c8 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -34,10 +34,20 @@
<groupId>org.apache.omid</groupId>
<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>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server</artifactId>
+ <artifactId>omid-tso-server-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -45,10 +55,21 @@
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-client-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>omid-hbase-commit-table-${hbase.exlude.shims.concatination}</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.exclude.artifactId}</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server</artifactId>
+ <artifactId>omid-tso-server-${hbase.shims.concatination}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/593eafe9/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 40a7613..8ac258d 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -34,12 +34,32 @@
<groupId>org.apache.omid</groupId>
<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>
<groupId>org.apache.omid</groupId>
<artifactId>omid-timestamp-storage</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>
<!-- End of Dependencies on Omid modules -->
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/593eafe9/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index a63bb4a..728be06 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -34,6 +34,12 @@
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-common-${hbase.shims.concatination}</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>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/593eafe9/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 76eb365..e25aa25 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -22,7 +22,7 @@
<version>0.9.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-tso-server</artifactId>
+ <artifactId>omid-tso-server-${hbase.shims.concatination}</artifactId>
<packaging>jar</packaging>
<name>TSO and TO Servers</name>
<description>Omid Transaction Status Oracle server and Timestamp Oracle</description>