From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 27 Mar 2015 15:22:43 +0000 (+0000)
Subject: Merge topic 'jaxb_junit_testing'
X-Git-Tag: release/lithium~84
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2f7869eb1584bf1da3b8cc73af24bc516c0f69d4;p=neutron.git

Merge topic 'jaxb_junit_testing'

* changes:
  Add JAXB JUnit testing for Neutron Floating IPs
  Add Junit testing of JAXB for Neutron FWaaS objects
---

2f7869eb1584bf1da3b8cc73af24bc516c0f69d4
diff --cc neutron-spi/pom.xml
index 60d346aeb,f80f13257..b7a9ab208
--- a/neutron-spi/pom.xml
+++ b/neutron-spi/pom.xml
@@@ -26,10 -26,16 +26,16 @@@
        <artifactId>slf4j-api</artifactId>
      </dependency>
      <dependency>
 -       <groupId>junit</groupId>
 -       <artifactId>junit</artifactId>
 -       <scope>test</scope>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <scope>test</scope>
      </dependency>
+     <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-json</artifactId>
+        <version>1.19</version>
+        <scope>test</scope>
+     </dependency>
    </dependencies>
    <build>
      <plugins>