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/24 08:37:31 UTC
incubator-omid git commit: Revert "tso jar also with hbase1-2 naming"
Repository: incubator-omid
Updated Branches:
refs/heads/phoenix-integration c88885ab8 -> 4b3eac65c
Revert "tso jar also with hbase1-2 naming"
This reverts commit c88885ab802dfb6774df921776a6b1b2fe17f41a.
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/4b3eac65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/4b3eac65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/4b3eac65
Branch: refs/heads/phoenix-integration
Commit: 4b3eac65c6eb6a82184f961db5866c23cadfa4be
Parents: c88885a
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Wed Oct 24 11:34:47 2018 +0300
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Wed Oct 24 11:34:47 2018 +0300
----------------------------------------------------------------------
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, 5 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4b3eac65/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 0dc7edf..968329d 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -26,26 +26,16 @@
<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-${hbase.shims.concatination}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-${hbase.shims.concatination}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4b3eac65/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index ee811ec..f192569 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -30,12 +30,6 @@
<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/4b3eac65/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 36edc79..a93508f 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -20,20 +20,10 @@
<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-${hbase.shims.concatination}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -41,21 +31,10 @@
<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-${hbase.shims.concatination}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4b3eac65/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 95ee768..5a4c562 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -20,32 +20,12 @@
<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/4b3eac65/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index f62da37..5d87b10 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -20,12 +20,6 @@
<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/4b3eac65/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 586f451..1a64a91 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -8,7 +8,7 @@
<version>0.9.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-tso-server-${hbase.shims.concatination}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<packaging>jar</packaging>
<name>TSO and TO Servers</name>
<description>Omid Transaction Status Oracle server and Timestamp Oracle</description>