diff --git a/.gitignore b/.gitignore index 3394359620518d030b1c6d493149db60902097d8..989ab5feca253aa4d8ab1d9d9f9abf78fd76aad4 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 00756707528600a0f0cc857be711e9c444e45be4..ffc64112c018752a30df51458c220d7786b68ba1 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 6041726271d1c45a5441ddf4c09c871f0483754d..585485b85433e42ad1c663dc8650836957448716 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>