From d4f9a51d5e538cbf8cdfbca92f68946cf4347e78 Mon Sep 17 00:00:00 2001
From: Mike Drob <madrob@cloudera.com>
Date: Tue, 14 Jan 2014 12:04:54 -0500
Subject: [PATCH] Cleanup for move to Accumulo 1.4.4
* set .gitignore to standard eclipse
* update versions of Accumulo to 1.4.4
* Pin slf4j binding to 1.5.8
Accumulo, Thrift, and YCSB all use different versions of slf4j, causing
runtime issues because everything is bundled together. Pin the version
to something in the middle that seems to work, even if it's not the
latest and greatest version.
---
.gitignore | 5 +++++
accumulo/pom.xml | 9 +++++++++
pom.xml | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 33943596..989ab5fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@ target
# ignore output files from testing
output*
+
+# ignore standard eclipse
+.project
+.classpath
+.settings
diff --git a/accumulo/pom.xml b/accumulo/pom.xml
index 00756707..ffc64112 100644
--- a/accumulo/pom.xml
+++ b/accumulo/pom.xml
@@ -93,4 +93,13 @@
<url>http://repository.apache.org/snapshots</url>
</repository>
</repositories>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
diff --git a/pom.xml b/pom.xml
index 60417262..585485b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<properties>
<maven.assembly.version>2.2.1</maven.assembly.version>
<hbase.version>0.92.1</hbase.version>
- <accumulo.version>1.4.3</accumulo.version>
+ <accumulo.version>1.4.4</accumulo.version>
<cassandra.version>0.7.0</cassandra.version>
<infinispan.version>7.1.0.CR1</infinispan.version>
<openjpa.jdbc.version>2.1.1</openjpa.jdbc.version>
--
GitLab