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:29 UTC
[34/50] [abbrv] incubator-omid git commit: [OMID-109] fix profile
issues with hbase2
[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/63eae5e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/63eae5e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/63eae5e3
Branch: refs/heads/master
Commit: 63eae5e3a3f4b5129b239881624e4f2b32965fd0
Parents: 6590397
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Wed Oct 17 19:34:00 2018 +0300
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Tue Nov 13 10:10:15 2018 +0200
----------------------------------------------------------------------
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/63eae5e3/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 1352a29..4816039 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -38,6 +38,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>
@@ -49,7 +55,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/63eae5e3/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index dc6aae5..c574ad5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,6 +34,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>
@@ -55,6 +61,12 @@
<version>${log4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
<build>
@@ -130,29 +142,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/63eae5e3/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 42d4380..d55182f 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -127,6 +127,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- end testing -->
</dependencies>
@@ -171,30 +177,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/63eae5e3/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 3e35260..0795a4a 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -115,6 +115,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 -->
@@ -150,30 +155,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/63eae5e3/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 515c0f6..4b325d5 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -71,14 +71,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>
@@ -86,38 +89,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/63eae5e3/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 828f454..9fe69d4 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -110,6 +110,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>
@@ -153,33 +158,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/63eae5e3/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index 3bca1be..75cad7e 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -25,7 +25,9 @@
<artifactId>omid-shims-aggregator</artifactId>
<packaging>pom</packaging>
<name>Shims Aggregator for HBase</name>
-
+ <modules>
+ <module>${shims.module}</module>
+ </modules>
<dependencies>
@@ -101,26 +103,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/63eae5e3/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 9db75c5..dda6aa2 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -87,6 +87,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- end testing -->
</dependencies>
@@ -107,32 +112,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/63eae5e3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a813d9b..c40264b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,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>
@@ -589,15 +592,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/63eae5e3/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 73f7fe5..3643d26 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -117,6 +117,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+
+ </dependency>
<!-- end testing -->
</dependencies>
@@ -137,30 +143,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/63eae5e3/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 79dca22..f451e90 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -35,11 +35,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>
@@ -202,6 +240,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.omid</groupId>
+ <artifactId>${shims.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- end testing -->
</dependencies>
@@ -285,29 +328,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>