Clean up dependencies a bit

Eliminate yet another set of warnings.

Change-Id: I16f659072a1c794c28daac43ccb37ffca9c327bb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml
index 9c9e68f28a21124a07f587812b5986b91859adb3..854420cba418da69525239de459068765c420f3d 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/pom.xml
+++ b/binding/mdsal-binding-java-api-generator/pom.xml
@@ -62,10 +62,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-export</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-model-api</artifactId>

diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml
index 90ebcfebc20d24d7189ef8e36ee383a90341a680..10594a0921b8899ab7d00389e13886dd8cc7cd55 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore/pom.xml
@@ -69,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-impl</artifactId>
+            <artifactId>yang-data-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml
index fd6ed29772cc274f1e0ee3bfd9a3fd61eb01ef3a..cbb12506a1fd1d3deeda101fcd015a2464d2e3f7 100644 (file)
--- a/dom/mdsal-dom-spi/pom.xml
+++ b/dom/mdsal-dom-spi/pom.xml
@@ -86,12 +86,12 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-api</artifactId>
+            <artifactId>yang-model-spi</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
+            <artifactId>yang-parser-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml
index 8f006a8c64f5a839c3fdd56b22a7065e91457327..84b5b1633ce6d0d4833712d262520deec57ab28a 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/pom.xml
+++ b/entityownership/mdsal-eos-dom-simple/pom.xml
@@ -24,10 +24,23 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.guicedee.services</groupId>
+            <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-common-api</artifactId>
@@ -44,16 +57,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.kohsuke.metainf-services</groupId>
-            <artifactId>metainf-services</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.guicedee.services</groupId>
-            <artifactId>javax.inject</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>