Repository: metamodel Updated Branches: refs/heads/master 889075cda -> 984efbcd7
[METAMODEL-93] - Added compatibility with HBase version 1.0.0 Fixes #12 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/984efbcd Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/984efbcd Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/984efbcd Branch: refs/heads/master Commit: 984efbcd7b1fcdfee88b98a91cc29e24e418730f Parents: 889075c Author: Kasper Sørensen <[email protected]> Authored: Sun Mar 29 13:02:38 2015 +0200 Committer: Kasper Sørensen <[email protected]> Committed: Sun Mar 29 13:02:38 2015 +0200 ---------------------------------------------------------------------- CHANGES.md | 1 + hbase/pom.xml | 6 +++++- pom.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/984efbcd/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index 0925565..13101ba 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ ### Apache MetaModel work-in-progress * [METAMODEL-123] - Added compatibility with ElasticSearch version 1.4.x + * [METAMODEL-93] - Added compatibility with Apache HBase version 1.0.0 * [METAMODEL-124] - Invoked ElasticSearch cross-version incompatible methods via reflection ### Apache MetaModel 4.3.2 http://git-wip-us.apache.org/repos/asf/metamodel/blob/984efbcd/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/hbase/pom.xml b/hbase/pom.xml index 730bca4..4c0d445 100644 --- a/hbase/pom.xml +++ b/hbase/pom.xml @@ -20,7 +20,7 @@ <name>MetaModel module for Apache HBase</name> <properties> - <hbase.version>0.95.1-hadoop1</hbase.version> + <hbase.version>1.0.0</hbase.version> </properties> <dependencies> @@ -114,6 +114,10 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/metamodel/blob/984efbcd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9b3c13d..8d17fa2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ under the License. <javadoc.version>2.9.1</javadoc.version> <slf4j.version>1.7.7</slf4j.version> <junit.version>4.11</junit.version> - <guava.version>18.0</guava.version> + <guava.version>16.0</guava.version> <easymock.version>3.2</easymock.version> <httpcomponents.version>4.3.1</httpcomponents.version> <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
