commit a366c375fee0b878e9ff1e0c6670742c0876fc95
author HIGUCHI Yuta <y-higuchi@onlab.us> Mon Jun 10 10:25:59 2013 -0700
committer HIGUCHI Yuta <y-higuchi@onlab.us> Mon Jun 10 10:25:59 2013 -0700
tree ffa19ef23b15bdfac5331d57884b2b9697928948
parent e4b07220bc58f255ddc35a8824d0aee8254b0f7f
parent 44794f5845dc7ef79e2bf372e41b287cb6f741d7

Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS into maven

pom.xml

diff --git a/pom.xml b/pom.xml
index 0d03e90..e79f8e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
   </repositories>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <powermock.version>1.5</powermock.version>
   </properties>
   <build>
     <plugins>
@@ -137,12 +138,15 @@
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
       <version>1.2</version>
+      <scope>test</scope>
     </dependency>
+    <!--
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>13.0.1</version>
     </dependency>
+    -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -202,7 +206,7 @@
     <dependency>
       <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
       <artifactId>concurrentlinkedhashmap-lru</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>org.python</groupId>
@@ -217,7 +221,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -227,6 +231,18 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-easymock</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
       <version>2.2.2</version>
@@ -244,7 +260,7 @@
     <dependency>
       <groupId>com.tinkerpop</groupId>
       <artifactId>frames</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1</version>
     </dependency>
     <dependency>
       <groupId>com.tinkerpop.blueprints</groupId>
@@ -285,5 +301,11 @@
       <version>2.4</version>
       <classifier>jdk15</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>apache-cassandra</artifactId>
+      <version>1.2.4</version>
+      <type>pom</type>
+    </dependency>
   </dependencies>
 </project>