Mercurial > hg > Database > jungle-network

diff pom.xml @ 46:fd3643699f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified pom.xml. fix conflict log4j libraries
author one
date Fri, 12 Jul 2013 11:27:00 +0900
parents d8ee57a1c2c6
children 25edf76b65dc
line wrap: on
line diff
--- a/pom.xml	Fri Jul 12 09:47:22 2013 +0900
+++ b/pom.xml	Fri Jul 12 11:27:00 2013 +0900
@@ -39,16 +39,27 @@
   		<groupId>org.apache.cassandra</groupId>
   		<artifactId>cassandra-all</artifactId>
   		<version>1.2.1</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>com.eaio.uuid</groupId>
-  		<artifactId>uuid</artifactId>
-  		<version>3.2</version>
+  		<exclusions>
+  			<exclusion>
+  				<groupId>org.slf4j</groupId>
+  				<artifactId>slf4j-log4j12</artifactId>
+  			</exclusion>
+  			<exclusion>
+  				<groupId>log4j</groupId>
+  				<artifactId>log4j</artifactId>
+  			</exclusion>
+  		</exclusions>
+  		
   	</dependency>
   	<dependency>
   		<groupId>jungle</groupId>
   		<artifactId>jungle-core</artifactId>
   		<version>0.0.1-SNAPSHOT</version>
   	</dependency>
+  	<dependency>
+  		<groupId>com.github.stephenc.eaio-uuid</groupId>
+  		<artifactId>uuid</artifactId>
+  		<version>3.3.0</version>
+  	</dependency>
   </dependencies>
 </project>