Repository: phoenix Updated Branches: refs/heads/omid2 f66538074 -> 408f9bdfd
- add omid run script. [OMID-119] - change names of dependencies Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/408f9bdf Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/408f9bdf Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/408f9bdf Branch: refs/heads/omid2 Commit: 408f9bdfd979382c8215efedfc19817bd53a5103 Parents: f665380 Author: Yonatan Gottesman <yonig...@gmail.com> Authored: Wed Oct 24 11:51:47 2018 +0300 Committer: James Taylor <jamestay...@apache.org> Committed: Wed Oct 24 09:30:31 2018 -0700 ---------------------------------------------------------------------- phoenix-assembly/pom.xml | 15 +++++++++++ .../components/all-common-dependencies.xml | 28 ++++++++++++++++++++ phoenix-core/pom.xml | 8 +++--- pom.xml | 8 +++--- 4 files changed, 51 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/408f9bdf/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index f11645a..f9d6d92 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -126,5 +126,20 @@ <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-queryserver-client</artifactId> </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>org.apache.omid</groupId> + <artifactId>omid-hbase-tools-hbase1.x</artifactId> + <version>${omid.version}</version> + </dependency> + <dependency> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + <version>3.2.0-incubating</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/phoenix/blob/408f9bdf/phoenix-assembly/src/build/components/all-common-dependencies.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml index 336bc4d..84388cd 100644 --- a/phoenix-assembly/src/build/components/all-common-dependencies.xml +++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml @@ -45,6 +45,34 @@ <include>io.netty:netty</include> <include>commons-codec:commons-codec</include> <include>org.apache.calcite:calcite-avatica*</include> + + <!-- For omid TSO --> + <include>org.apache.omid:omid-tso-server-hbase1.x</include> + <include>org.apache.omid:omid-hbase-common-hbase1.x</include> + <include>org.apache.omid:omid-hbase-tools-hbase1.x</include> + <include>org.apache.omid:omid-common</include> + <include>org.apache.omid:omid-metrics</include> + <include>org.apache.omid:omid-timestamp-storage-hbase1.x</include> + <include>org.apache.omid:omid-hbase-shims-hbase1.x</include> + <include>org.apache.omid:omid-commit-table</include> + <include>org.apache.omid:omid-codahale-metrics</include> + <include>org.apache.omid:omid-hbase-commit-table-hbase1.x</include> + <include>org.yaml:snakeyaml</include> + <include>com.google.inject:guice</include> + <include>commons-beanutils:commons-beanutils</include> + <include>javax.inject:javax.inject</include> + <include>aopalliance:aopalliance</include> + <include>org.apache.commons:commons-pool2</include> + <include>com.lmax:disruptor</include> + <include>com.codahale.metrics:metrics-core</include> + <include>com.beust:jcommander</include> + <include>commons-collections:commons-collections</include> + <include>io.netty:netty-all</include> + <include>org.apache.htrace:htrace-core</include> + <include>javax.servlet:javax.servlet-api</include> + <include>commons-cli:commons-cli</include> + <include>com.yammer.metrics:metrics-core</include> + <include>com.codahale.metrics:metrics-graphite</include> </includes> </dependencySet> <!-- Separate dependency set to just pull in the jackson stuff since its test http://git-wip-us.apache.org/repos/asf/phoenix/blob/408f9bdf/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index d70ed1a..62649b4 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -206,7 +206,7 @@ <dependencies> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-hbase-client-hbase1.3</artifactId> + <artifactId>omid-hbase-client-hbase1.x</artifactId> <version>${omid.version}</version> <exclusions> <exclusion> @@ -217,7 +217,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-hbase-coprocessor-hbase1.3</artifactId> + <artifactId>omid-hbase-coprocessor-hbase1.x</artifactId> <version>${omid.version}</version> <exclusions> <exclusion> @@ -228,7 +228,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-tso-server-hbase1.3</artifactId> + <artifactId>omid-tso-server-hbase1.x</artifactId> <version>${omid.version}</version> <exclusions> <exclusion> @@ -239,7 +239,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-tso-server-hbase1.3</artifactId> + <artifactId>omid-tso-server-hbase1.x</artifactId> <version>${omid.version}</version> <type>test-jar</type> <exclusions> http://git-wip-us.apache.org/repos/asf/phoenix/blob/408f9bdf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ca40753..27854ff 100644 --- a/pom.xml +++ b/pom.xml @@ -816,7 +816,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-tso-server-hbase1.3</artifactId> + <artifactId>omid-hbase-client-hbase1.x</artifactId> <version>${omid.version}</version> <exclusions> <exclusion> @@ -827,7 +827,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-hbase-client-hbase1.3</artifactId> + <artifactId>omid-hbase-coprocessor-hbase1.x</artifactId> <version>${omid.version}</version> <exclusions> <exclusion> @@ -838,7 +838,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-hbase-coprocessor-hbase1.3</artifactId> + <artifactId>omid-tso-server-hbase1.x</artifactId> <version>${omid.version}</version> <exclusions> <exclusion> @@ -849,7 +849,7 @@ </dependency> <dependency> <groupId>org.apache.omid</groupId> - <artifactId>omid-tso-server-hbase1.3</artifactId> + <artifactId>omid-tso-server-hbase1.x</artifactId> <version>${omid.version}</version> <type>test-jar</type> <exclusions>
