Bump odlparent to 5.0.0

[netconf.git] / restconf / restconf-nb-rfc8040 / pom.xml

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index 4ace68941336c66c8d2103280ebb94b478e294c9..c4a268c2967bacb2a0fe3422461c42eb799aeffc 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -31,6 +31,7 @@
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
@@ -118,6 +119,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
+      <version>20131018</version>
     </dependency>
 
     <dependency>
@@ -194,6 +196,12 @@
       <plugin>
         <groupId>org.apache.aries.blueprint</groupId>
         <artifactId>blueprint-maven-plugin</artifactId>
+        <configuration>
+          <scanPaths>
+            <!-- FIXME: we *really* should be in org.opendaylight.netconf ! -->
+            <scanPath>org.opendaylight.restconf</scanPath>
+          </scanPaths>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>