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/17 16:43:27 UTC
incubator-omid git commit: [OMID-109] fix profile issues with hbase2
Repository: incubator-omid
Updated Branches:
refs/heads/phoenix-integration 07a3a640e -> 35053f720
[OMID-109] fix profile issues with hbase2
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/35053f72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/35053f72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/35053f72
Branch: refs/heads/phoenix-integration
Commit: 35053f72014fb945162d6c553f66e2cb7b48c70d
Parents: 07a3a64
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Wed Oct 17 19:34:00 2018 +0300
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Wed Oct 17 19:34:00 2018 +0300
----------------------------------------------------------------------
benchmarks/pom.xml | 7 ++++-
examples/pom.xml | 37 ++++++++---------------
hbase-client/pom.xml | 31 ++++---------------
hbase-commit-table/pom.xml | 31 +++----------------
hbase-common/pom.xml | 37 +++--------------------
hbase-coprocessor/pom.xml | 33 +++-----------------
hbase-shims/pom.xml | 44 ++++++++++++++-------------
hbase-tools/pom.xml | 33 +++-----------------
pom.xml | 10 ++++++
timestamp-storage/pom.xml | 32 ++++----------------
tso-server/pom.xml | 67 ++++++++++++++++++++++++++---------------
11 files changed, 126 insertions(+), 236 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 0c84a66..5e59074 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -24,6 +24,12 @@
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-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>
@@ -35,7 +41,6 @@
<artifactId>omid-codahale-metrics</artifactId>
<version>${project.version}</version>
</dependency>
-
<!-- End of Dependencies on Omid modules -->
<!-- utils -->
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 62e46af..e2d569a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,6 +21,12 @@
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-client</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.exclude.artifactId}</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -42,6 +48,12 @@
<version>${log4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
<build>
@@ -117,29 +129,4 @@
</build>
- <profiles>
- <profile>
- <id>hbase-1</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index f8bf203..f065dfd 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -113,6 +113,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- end testing -->
</dependencies>
@@ -157,30 +163,5 @@
</build>
- <profiles>
-
- <profile>
- <id>hbase-1</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index c432536..1f5d028 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -101,6 +101,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- end testing -->
<!-- TODO remove these two dependencies that are required for HBaseCommitTableTester -->
@@ -136,30 +141,4 @@
</build>
- <profiles>
-
- <profile>
- <id>hbase-1</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 85ae447..83a86a7 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -57,14 +57,17 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- end testing -->
</dependencies>
<build>
-
<plugins>
-
<!-- Disable maven site plugin -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
@@ -72,38 +75,8 @@
<skip>true</skip>
</configuration>
</plugin>
-
</plugins>
</build>
- <profiles>
-
- <profile>
- <id>hbase-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index de5f565..37c2859 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -96,6 +96,11 @@
<artifactId>hbase-testing-util</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- end testing -->
</dependencies>
@@ -139,33 +144,5 @@
</build>
- <profiles>
-
- <profile>
- <id>hbase-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index 118b7fe..a3b593a 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -11,7 +11,9 @@
<artifactId>omid-shims-aggregator</artifactId>
<packaging>pom</packaging>
<name>Shims Aggregator for HBase</name>
-
+ <modules>
+ <module>${shims.module}</module>
+ </modules>
<dependencies>
@@ -87,26 +89,26 @@
</build>
- <profiles>
-
- <profile>
- <id>hbase-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>hbase-1</module>
- </modules>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <modules>
- <module>hbase-2</module>
- </modules>
- </profile>
-
- </profiles>
+ <!--<profiles>-->
+
+ <!--<profile>-->
+ <!--<id>hbase-1</id>-->
+ <!--<activation>-->
+ <!--<activeByDefault>true</activeByDefault>-->
+ <!--</activation>-->
+ <!--<modules>-->
+ <!--<module>hbase-1</module>-->
+ <!--</modules>-->
+ <!--</profile>-->
+
+ <!--<profile>-->
+ <!--<id>hbase-2</id>-->
+ <!--<modules>-->
+ <!--<module>hbase-2</module>-->
+ <!--</modules>-->
+ <!--</profile>-->
+
+ <!--</profiles>-->
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 086e108..fcfb1ae 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -73,6 +73,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- end testing -->
</dependencies>
@@ -93,32 +98,4 @@
</build>
- <profiles>
- <profile>
- <id>hbase-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8373303..a39ff0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,9 @@
<properties>
+ <shims1.artifactId>omid-hbase1-shims</shims1.artifactId>
+ <shims2.artifactId>omid-hbase2-shims</shims2.artifactId>
+
<!-- Basic properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -549,15 +552,22 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
+ <shims.artifactId>${shims1.artifactId}</shims.artifactId>
+ <shims.exclude.artifactId>${shims2.artifactId}</shims.exclude.artifactId>
<java.version>1.7</java.version>
<hadoop.version>${hadoop1.version}</hadoop.version>
<hbase.version>${hbase1.version}</hbase.version>
+ <shims.module>hbase-1</shims.module>
</properties>
</profile>
<profile>
<id>hbase-2</id>
<properties>
+ <shims.artifactId>${shims2.artifactId}</shims.artifactId>
+ <shims.exclude.artifactId>${shims1.artifactId}</shims.exclude.artifactId>
+ <shims.module>hbase-2</shims.module>
+ <shims.artifactId>omid-hbase2-shims</shims.artifactId>
<java.version>1.8</java.version>
<hadoop.version>${hadoop2.version}</hadoop.version>
<hbase.version>${hbase2.version}</hbase.version>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index a41343d..505ae8a 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -103,6 +103,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+
+ </dependency>
<!-- end testing -->
</dependencies>
@@ -123,30 +129,4 @@
</build>
- <profiles>
-
- <profile>
- <id>hbase-1</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/35053f72/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 88bc016..3742c6b 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -21,11 +21,49 @@
<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>
+ <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-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-timestamp-storage</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>
@@ -188,6 +226,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- end testing -->
</dependencies>
@@ -271,29 +314,5 @@
</build>
- <profiles>
- <profile>
- <id>hbase-1</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase1-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hbase-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase2-shims</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
</project>