Replacing pom with the one from master to avoid merge conflicts
</resources>
</build>
<dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<dependency>
<groupId>org.projectfloodlight</groupId>
<artifactId>openflowj</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>${lib-jackson-version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
</dependencies>
<properties>
<lib-restlet-version>2.3.2</lib-restlet-version>
