This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push: new 1b82bf6 OMID-188 Fix "inconsistent module metadata found" when using hbase-2 1b82bf6 is described below commit 1b82bf665e3ecf4c1503b2796af36a7799e74db1 Author: Chia-Ping Tsai <chia7...@gmail.com> AuthorDate: Mon Nov 16 15:42:47 2020 +0800 OMID-188 Fix "inconsistent module metadata found" when using hbase-2 --- .gitignore | 1 + benchmarks/pom.xml | 20 +++++--------------- codahale-metrics/pom.xml | 6 +++--- commit-table/pom.xml | 4 ++-- common/pom.xml | 4 ++-- examples/pom.xml | 16 +++------------- hbase-client/pom.xml | 24 ++++-------------------- hbase-commit-table/pom.xml | 12 +++--------- hbase-common/pom.xml | 2 +- hbase-coprocessor/pom.xml | 22 +--------------------- hbase-shims/hbase-1/pom.xml | 4 ++-- hbase-shims/hbase-2/pom.xml | 2 +- hbase-shims/pom.xml | 4 ++-- hbase-tools/pom.xml | 22 +--------------------- metrics/pom.xml | 4 ++-- pom.xml | 44 ++++++++++++++++++++++++++++++-------------- statemachine/pom.xml | 4 ++-- timestamp-storage/pom.xml | 10 ++-------- transaction-client/pom.xml | 14 +++++++------- tso-server/pom.xml | 38 ++++++-------------------------------- 20 files changed, 80 insertions(+), 177 deletions(-) diff --git a/.gitignore b/.gitignore index c5d7a96..84db584 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .project .settings .metadata +.flattened-pom.xml dependency-reduced-pom.xml target/ lib/ diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 8d7ea0a..de30dec 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -18,11 +18,11 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> - <artifactId>omid-benchmarks</artifactId> + <artifactId>omid-benchmarks-${hbase.artifactId.suffix}</artifactId> <name>Benchmarks</name> <dependencies> @@ -31,32 +31,22 @@ <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-transaction-client</artifactId> + <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-metrics</artifactId> + <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-codahale-metrics</artifactId> + <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <!-- End of Dependencies on Omid modules --> diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml index 39b0076..64d5c0f 100644 --- a/codahale-metrics/pom.xml +++ b/codahale-metrics/pom.xml @@ -15,14 +15,14 @@ <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/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>omid</artifactId> <groupId>org.apache.omid</groupId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>omid-codahale-metrics</artifactId> + <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId> <name>Codahale Metrics</name> <dependencies> @@ -31,7 +31,7 @@ <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-metrics</artifactId> + <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> diff --git a/commit-table/pom.xml b/commit-table/pom.xml index 56240b0..e6496b5 100644 --- a/commit-table/pom.xml +++ b/commit-table/pom.xml @@ -18,11 +18,11 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> - <artifactId>omid-commit-table</artifactId> + <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId> <packaging>jar</packaging> <name>Commit Table</name> diff --git a/common/pom.xml b/common/pom.xml index f298850..e827729 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,11 +18,11 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> - <artifactId>omid-common</artifactId> + <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId> <name>Common</name> <packaging>jar</packaging> diff --git a/examples/pom.xml b/examples/pom.xml index 2753dd0..b6445af 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,12 +17,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>omid</artifactId> <groupId>org.apache.omid</groupId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> - <artifactId>omid-examples</artifactId> + <artifactId>omid-examples-${hbase.artifactId.suffix}</artifactId> <name>Omid Client Examples</name> <description>Includes some examples showing Omid features</description> @@ -34,21 +34,11 @@ <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-client-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-codahale-metrics</artifactId> + <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <!-- End of Dependencies on Omid modules --> diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 38a3fff..aae83e9 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> @@ -33,28 +33,18 @@ <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-common</artifactId> + <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-transaction-client</artifactId> + <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.omid</groupId> @@ -76,7 +66,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-commit-table</artifactId> + <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> @@ -155,12 +145,6 @@ <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 --> diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml index d184554..cec9e3d 100644 --- a/hbase-commit-table/pom.xml +++ b/hbase-commit-table/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> @@ -32,24 +32,18 @@ <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-commit-table</artifactId> + <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-common</artifactId> + <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</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 --> diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index ab458ec..e1d3eaa 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml index 1c82a75..5b3f926 100644 --- a/hbase-coprocessor/pom.xml +++ b/hbase-coprocessor/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> @@ -34,16 +34,6 @@ <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.omid</groupId> @@ -55,16 +45,6 @@ <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-client-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.omid</groupId> - <artifactId>omid-hbase-commit-table-${hbase.exclude.artifactId.suffix}</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.omid</groupId> - <artifactId>${shims.exclude.artifactId}</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml index 6e23377..fb5408f 100644 --- a/hbase-shims/hbase-1/pom.xml +++ b/hbase-shims/hbase-1/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid-shims-aggregator</artifactId> + <artifactId>omid-shims-aggregator-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-common</artifactId> + <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> diff --git a/hbase-shims/hbase-2/pom.xml b/hbase-shims/hbase-2/pom.xml index d17cfae..8770a56 100644 --- a/hbase-shims/hbase-2/pom.xml +++ b/hbase-shims/hbase-2/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid-shims-aggregator</artifactId> + <artifactId>omid-shims-aggregator-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml index df5ea8e..3e66d6f 100644 --- a/hbase-shims/pom.xml +++ b/hbase-shims/pom.xml @@ -18,11 +18,11 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> - <artifactId>omid-shims-aggregator</artifactId> + <artifactId>omid-shims-aggregator-${hbase.artifactId.suffix}</artifactId> <packaging>pom</packaging> <name>Shims Aggregator for HBase</name> <modules> diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml index 94f2b97..1effaaa 100644 --- a/hbase-tools/pom.xml +++ b/hbase-tools/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> @@ -34,32 +34,12 @@ <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.omid</groupId> <artifactId>omid-timestamp-storage-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> <!-- End of Dependencies on Omid modules --> diff --git a/metrics/pom.xml b/metrics/pom.xml index 8491c7d..57ad101 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -17,12 +17,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>omid</artifactId> <groupId>org.apache.omid</groupId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> - <artifactId>omid-metrics</artifactId> + <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId> <name>Metrics</name> <dependencies> diff --git a/pom.xml b/pom.xml index f0463ed..2b3797a 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <inceptionYear>2011</inceptionYear> <url>http://omid.incubator.apache.org</url> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <packaging>pom</packaging> <!-- WARNING: do not update version manually, use mvn versions:set --> <version>1.0.3-SNAPSHOT</version> @@ -156,14 +156,11 @@ <!-- hbase-1 profile props are here and not in profile section to work better with intelij--> <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> <hbase.artifactId.suffix>${hbase1.artifactId.suffix}</hbase.artifactId.suffix> - <hbase.exclude.artifactId.suffix>${hbase2.artifactId.suffix}</hbase.exclude.artifactId.suffix> - <!-- Basic properties --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -335,6 +332,33 @@ <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.2.5</version> + <configuration> + <updatePomFile>true</updatePomFile> + </configuration> + <executions> + <!-- enable flattening --> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + </execution> + <!-- ensure proper cleanup --> + <execution> + <id>flatten.clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -580,29 +604,21 @@ </build> </profile> + <profile> <id>hbase-1</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - - </properties> + <!-- Empty profile to prevent warning when compiling with -Phbase-1 --> </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>${shims2.artifactId}</shims.artifactId> <java.version>1.8</java.version> <hadoop.version>${hadoop2.version}</hadoop.version> <hbase.version>${hbase2.version}</hbase.version> <hbase.artifactId.suffix>${hbase2.artifactId.suffix}</hbase.artifactId.suffix> - <hbase.exclude.artifactId.suffix>${hbase1.artifactId.suffix}</hbase.exclude.artifactId.suffix> - </properties> </profile> diff --git a/statemachine/pom.xml b/statemachine/pom.xml index ba4a954..0b7521e 100644 --- a/statemachine/pom.xml +++ b/statemachine/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> <name>State Machine</name> - <artifactId>omid-statemachine</artifactId> + <artifactId>omid-statemachine-${hbase.artifactId.suffix}</artifactId> <packaging>jar</packaging> <dependencies> diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml index de31fc1..baf9e8b 100644 --- a/timestamp-storage/pom.xml +++ b/timestamp-storage/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> @@ -34,16 +34,10 @@ <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</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-common</artifactId> + <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml index 6b52bba..ffd57b5 100644 --- a/transaction-client/pom.xml +++ b/transaction-client/pom.xml @@ -18,11 +18,11 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> - <artifactId>omid-transaction-client</artifactId> + <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId> <packaging>jar</packaging> <name>Transaction Client</name> @@ -32,27 +32,27 @@ <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-common</artifactId> + <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-statemachine</artifactId> + <artifactId>omid-statemachine-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-commit-table</artifactId> + <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-metrics</artifactId> + <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-commit-table</artifactId> + <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> diff --git a/tso-server/pom.xml b/tso-server/pom.xml index e4f35cb..c34a47e 100644 --- a/tso-server/pom.xml +++ b/tso-server/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.omid</groupId> - <artifactId>omid</artifactId> + <artifactId>omid-${hbase.artifactId.suffix}</artifactId> <version>1.0.3-SNAPSHOT</version> </parent> @@ -33,7 +33,7 @@ <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-commit-table</artifactId> + <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> @@ -41,28 +41,12 @@ <groupId>org.apache.omid</groupId> <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</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-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> @@ -70,27 +54,17 @@ <groupId>org.apache.omid</groupId> <artifactId>omid-timestamp-storage-${hbase.artifactId.suffix}</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.exclude.artifactId.suffix}</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-metrics</artifactId> + <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency> <!-- The codahale-related dependency is added here just to include the jar in the final tar.gz package assembled. --> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-codahale-metrics</artifactId> + <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> @@ -104,14 +78,14 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-commit-table</artifactId> + <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-transaction-client</artifactId> + <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId> <version>${project.version}</version> </dependency>