Merge "Fix for improved Eclipse IDE setup: m2e Checkstyle ConversionException"

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 8c3b412ab7fba44f343f50e82c23ac69dfffac35..590c3ef02e34c7efd1c5e7daad7fd992568b6e3f 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -285,6 +285,11 @@
         <artifactId>jersey-guava</artifactId>
         <version>2.8</version>
       </dependency>
+      <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.json</artifactId>
+        <version>1.0.4</version>
+      </dependency>
       <dependency>
         <groupId>com.eclipsesource.jaxrs</groupId>
         <artifactId>jersey-all</artifactId>
@@ -329,6 +334,12 @@
         <version>${jersey.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.sun.jersey.jersey-test-framework</groupId>
+        <artifactId>jersey-test-framework-inmemory</artifactId>
+        <version>1.17</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-client</artifactId>
@@ -732,6 +743,11 @@
         <artifactId>org.apache.felix.fileinstall</artifactId>
         <version>3.1.6</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.metatype</artifactId>
+        <version>1.1.2</version>
+      </dependency>
       <!-- felix webconsole -->
       <dependency>
         <groupId>org.apache.felix</groupId>