Cleanup build system

Clean up pom.xmls, to eliminate dupliciate aggragator
functions, properly import upstream artifacts and correct
relativePath declarations.

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

diff --git a/features/pom.xml b/features/pom.xml
index 6e555be83fe371e88a8af4abad63f12a8cf9b53a..3b183f224d6b557422c8030702be6f7460b07e92 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -9,12 +9,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>

-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>netconf-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>2.0.2</version>
+    <relativePath/>

   </parent>
   </parent>

+
+  <groupId>org.opendaylight.netconf</groupId>

   <artifactId>netconf-features-parent</artifactId>
   <artifactId>netconf-features-parent</artifactId>

+  <version>1.3.0-SNAPSHOT</version>

   <packaging>pom</packaging>
 
   <modules>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml
index 265a124027e5bdec2feefebd5ee44fa8436e8bad..e918c03e936aceb83f250602abb580c833676448 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/pom.xml
+++ b/netconf/aaa-authn-odl-plugin/pom.xml
@@ -25,11 +25,18 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-artifacts</artifactId>
+                <version>0.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 

diff --git a/netconf/callhome-protocol/pom.xml b/netconf/callhome-protocol/pom.xml
index 578d6a26bf2178b3879f7b608e74d3674574c6bb..4f706c6387a395281392d22b328e75b14d4fd024 100644 (file)
--- a/netconf/callhome-protocol/pom.xml
+++ b/netconf/callhome-protocol/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/netconf/callhome-provider/pom.xml b/netconf/callhome-provider/pom.xml
index 9b4aaa14064d269ded6a75901dc2a87d17928e61..6a85aa50ee02e213b5f79cc21d4e431a349d2353 100644 (file)
--- a/netconf/callhome-provider/pom.xml
+++ b/netconf/callhome-provider/pom.xml
@@ -19,11 +19,18 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 

diff --git a/netconf/config-netconf-connector/pom.xml b/netconf/config-netconf-connector/pom.xml
index 66edaf3c6ffe19321a15b229aaa5aecee3c77f06..6a2eb71fa85eb06c9f7e198ac785fb5f4d228cea 100644 (file)
--- a/netconf/config-netconf-connector/pom.xml
+++ b/netconf/config-netconf-connector/pom.xml
@@ -26,11 +26,32 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 


@@ -68,10 +89,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-util</artifactId>
     </dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-util</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>yang-jmx-generator</artifactId>
-    </dependency>

     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>


@@ -83,6 +100,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-generator-impl</artifactId>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-generator-impl</artifactId>

+      <scope>test</scope>

     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index 73b3b777d59430903171fbb1c61b777592579506..e0c6983205298122fc4929b37a98ee85138ebd3c 100644 (file)
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -26,11 +26,25 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 

diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml
index 44eb9092f33965eaebea923b79e8289670b680c1..d4dc7373db19226a5f5727461e484cbe39131bd0 100644 (file)
--- a/netconf/mdsal-netconf-impl/pom.xml
+++ b/netconf/mdsal-netconf-impl/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml
index de39fb4a4969e588ae115a817a2dfb68d5b84080..506b8bf43c633d2ca592d23124920352c832363d 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/netconf/mdsal-netconf-monitoring/pom.xml
@@ -25,11 +25,32 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 

diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index 454f9168eb90c50363a99d9a92e72ef3405aba71..3aeba6412c451e4fdd01da656d7a171d79bab64d 100644 (file)
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -25,11 +25,25 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 

diff --git a/netconf/mdsal-netconf-ssh/pom.xml b/netconf/mdsal-netconf-ssh/pom.xml
index d4c8673368cd6e98142caed2ad6245bfa7e61027..fa5f0f788bb021241d30ee36cfde5e3f7c227115 100644 (file)
--- a/netconf/mdsal-netconf-ssh/pom.xml
+++ b/netconf/mdsal-netconf-ssh/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/netconf/mdsal-netconf-tcp/pom.xml b/netconf/mdsal-netconf-tcp/pom.xml
index fcfee60d2c3da667cc02872294cc95434e3a2466..27f11b40de48ee05829e332efc4423d11c9b85df 100644 (file)
--- a/netconf/mdsal-netconf-tcp/pom.xml
+++ b/netconf/mdsal-netconf-tcp/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml
index 30cb34fce2364d5e161ac0a3db78fdbb36fc727c..ea96b7dd26d7bb8171aae20ebb5cecc58cc29f39 100644 (file)
--- a/netconf/mdsal-netconf-yang-library/pom.xml
+++ b/netconf/mdsal-netconf-yang-library/pom.xml
@@ -26,11 +26,32 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 

diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml
index 93ea90d936ef2775c80c3e58efce13a5461ddd2f..6750a90d5240d1a0c4e42d62eb65a6ec5dd07998 100644 (file)
--- a/netconf/messagebus-netconf/pom.xml
+++ b/netconf/messagebus-netconf/pom.xml
@@ -28,11 +28,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 

diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index 1eb0c49e22c9067c3c6c57e0849701708d76594e..33d61e9d4e31d73eb5d3903ce955412e340f3440 100644 (file)
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -26,11 +26,32 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 


@@ -50,6 +71,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol-framework</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol-framework</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml
index 683665908eb5e4491c329bcc3d43b4dc7f7ff60d..761b1039609d1407a8bfc72add8e4f7f6e498ddc 100644 (file)
--- a/netconf/netconf-artifacts/pom.xml
+++ b/netconf/netconf-artifacts/pom.xml
@@ -151,13 +151,6 @@
                 <artifactId>messagebus-netconf</artifactId>
                 <version>${project.version}</version>
             </dependency>
                 <artifactId>messagebus-netconf</artifactId>
                 <version>${project.version}</version>
             </dependency>

-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-netconf-connector</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>

 
             <dependency>
                 <groupId>${project.groupId}</groupId>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>


@@ -281,14 +274,6 @@
                 <version>${project.version}</version>
             </dependency>
 
                 <version>${project.version}</version>
             </dependency>
 

-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-netconf</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-

             <!-- netconf features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
             <!-- netconf features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>

diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml
index 7de7fbf6de2f7ff7bd50c2eec83ed9501dcb5f41..2cfed47470c3b3aded97f358eae810f73bedb344 100644 (file)
--- a/netconf/netconf-client/pom.xml
+++ b/netconf/netconf-client/pom.xml
@@ -26,11 +26,18 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 


@@ -57,10 +64,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>protocol-framework</artifactId>
-    </dependency>

     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/netconf/netconf-connector-config/pom.xml b/netconf/netconf-connector-config/pom.xml
index 73fe934730797391732bfae412bca0ce0ac5509c..d3be6f58912a94682c80c0ebe3fcbf4788608a9c 100644 (file)
--- a/netconf/netconf-connector-config/pom.xml
+++ b/netconf/netconf-connector-config/pom.xml
@@ -27,7 +27,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>

diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml
index 2bbc05eed37445cf9c8e24bf23c31525ff2610bf..4a5595c4cb666b72435ef984ca0c09bac450472e 100644 (file)
--- a/netconf/netconf-console/pom.xml
+++ b/netconf/netconf-console/pom.xml
@@ -25,11 +25,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 

diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index 06a5e232e56e10a5414324555aefacc2ddd7686f..35241b6bf40897053722be4509004e87d798df94 100644 (file)
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -26,11 +26,25 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 


@@ -72,10 +86,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>protocol-framework</artifactId>
-    </dependency>

     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>threadpool-config-api</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>threadpool-config-api</artifactId>


@@ -86,11 +96,6 @@
       <artifactId>mockito-configuration</artifactId>
     </dependency>
 
       <artifactId>mockito-configuration</artifactId>
     </dependency>
 

-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-

     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml
index 1b1c8bc1c0389a657a2a2f1e130f5213a24222c6..cbe00f7148b90e7a9c08fc16abb12e250c006ca4 100644 (file)
--- a/netconf/netconf-mapping-api/pom.xml
+++ b/netconf/netconf-mapping-api/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/netconf/netconf-monitoring/pom.xml b/netconf/netconf-monitoring/pom.xml
index 21c4a9e4102485f73e6ad7c5909e20875a03de90..c4ba5a0c7b00dce5a44f2b9d603b09e69fc30d5f 100644 (file)
--- a/netconf/netconf-monitoring/pom.xml
+++ b/netconf/netconf-monitoring/pom.xml
@@ -26,11 +26,25 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 

diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml
index 792a1d479b30c4a7e7e6a2e41d0067ce01410519..44fa3c6fa6b8eadd8fc1b5478435c5989118103d 100644 (file)
--- a/netconf/netconf-netty-util/pom.xml
+++ b/netconf/netconf-netty-util/pom.xml
@@ -26,20 +26,18 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-parent</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

-

       <dependency>
       <dependency>

-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-subsystem</artifactId>
-        <version>${project.version}</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>

         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

-

       <dependency>
         <groupId>openexi</groupId>
         <artifactId>nagasena</artifactId>
       <dependency>
         <groupId>openexi</groupId>
         <artifactId>nagasena</artifactId>


@@ -75,10 +73,6 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
     </dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>protocol-framework</artifactId>
-    </dependency>

     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-core</artifactId>
     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-core</artifactId>

diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml
index 752dfd09780a7c9b840830dd5f3389d262868b7d..aef8fde9b211cb34c01a2cb3911c2fd4969ed4a5 100644 (file)
--- a/netconf/netconf-notifications-api/pom.xml
+++ b/netconf/netconf-notifications-api/pom.xml
@@ -28,7 +28,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>

diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml
index 1be1d3b3f6bf69cfdfd9554bf0056c64e12b26b0..50f8c40f607b8460cd13c000ebeac9230d413f2f 100644 (file)
--- a/netconf/netconf-notifications-impl/pom.xml
+++ b/netconf/netconf-notifications-impl/pom.xml
@@ -27,11 +27,32 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.3.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 

diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml
index 15ad38799763e616d2b576d791646769ffe1d96c..10cb64b162c1825c822f83c1551c341bfb96174d 100644 (file)
--- a/netconf/netconf-ssh/pom.xml
+++ b/netconf/netconf-ssh/pom.xml
@@ -25,11 +25,32 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 

diff --git a/netconf/netconf-tcp/pom.xml b/netconf/netconf-tcp/pom.xml
index 73e1b285e68649f780ce77988e50db25388a31f7..b802e1c42f432c3f117b375ae6e6ef666c878ea8 100644 (file)
--- a/netconf/netconf-tcp/pom.xml
+++ b/netconf/netconf-tcp/pom.xml
@@ -26,11 +26,25 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 

diff --git a/netconf/netconf-topology-config/pom.xml b/netconf/netconf-topology-config/pom.xml
index bd063fe2e272ad25c8724958a6876c5358abfb31..2f6d55f38d33e1df171659db37013dcf82512242 100644 (file)
--- a/netconf/netconf-topology-config/pom.xml
+++ b/netconf/netconf-topology-config/pom.xml
@@ -28,7 +28,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>

diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml
index 4014443859b3a697654ad6848ae593cf44fd0dcf..ca8f49847250274688175fd9afedae74bd28c04b 100644 (file)
--- a/netconf/netconf-topology-singleton/pom.xml
+++ b/netconf/netconf-topology-singleton/pom.xml
@@ -28,11 +28,18 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>

diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml
index 09bade954479facff7b2ae0bc2cd6e8cd3ec94ab..34dfc2d843254fa9d0b80f412bf2eda592aaec7d 100644 (file)
--- a/netconf/netconf-topology/pom.xml
+++ b/netconf/netconf-topology/pom.xml
@@ -19,11 +19,32 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 


@@ -32,10 +53,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>

-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-generator-impl</artifactId>
-        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>

diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml
index 43ec022c2359c31286c50cfae404ca0d4fba8f7f..85b6bb1fc5291744a02db9daf2cec1181cd69b18 100644 (file)
--- a/netconf/netconf-util/pom.xml
+++ b/netconf/netconf-util/pom.xml
@@ -26,15 +26,22 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-parent</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>

-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-subsystem</artifactId>
-        <version>${project.version}</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.3.0-SNAPSHOT</version>

         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>


@@ -43,10 +50,6 @@
 
   <dependencies>
     <!-- compile dependencies -->
 
   <dependencies>
     <!-- compile dependencies -->

-   <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-generator-impl</artifactId>
-    </dependency>

     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-api</artifactId>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-api</artifactId>


@@ -72,6 +75,11 @@
       <artifactId>xmlunit</artifactId>
       <scope>test</scope>
     </dependency>
       <artifactId>xmlunit</artifactId>
       <scope>test</scope>
     </dependency>

+   <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
+      <scope>test</scope>
+    </dependency>

     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>


@@ -84,6 +92,10 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-api</artifactId>
     </dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-api</artifactId>
     </dependency>

+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>

     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 2330254ac916e1674c2ff8fcbc3b2dabf63ae8cf..fe028cff3d64f567157a1fe8419f81f6910017e9 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -63,30 +63,4 @@
 
     <module>netconf-artifacts</module>
   </modules>
 
     <module>netconf-artifacts</module>
   </modules>

-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-parent</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>protocol-framework</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>

 </project>
 </project>

diff --git a/netconf/tools/netconf-cli/pom.xml b/netconf/tools/netconf-cli/pom.xml
index 0d855c4ed6c17db0a11f1ff66e0cc207efbdac81..e7ed9b517d9cd457d8e178eef358b622b13e8a9f 100644 (file)
--- a/netconf/tools/netconf-cli/pom.xml
+++ b/netconf/tools/netconf-cli/pom.xml
@@ -30,11 +30,32 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>

-        <artifactId>netconf-subsystem</artifactId>
+        <artifactId>netconf-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index b7cbc16210baf2e0c04fb289865ec70456c69d71..090b03cb8a6526ad77c5cd2f2d762053be95c078 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -32,11 +32,39 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>

-                <artifactId>netconf-subsystem</artifactId>
+                <artifactId>netconf-artifacts</artifactId>

                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index 6ca3d458ad1a4d4e1f7faa44b52d88c3f5bb648a..2cc0aae07cf4ac464de4d33e2853874d19b2c35d 100644 (file)
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -10,12 +10,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>netconf-subsystem</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>2.0.2</version>
+    <relativePath/>

   </parent>
 
   </parent>
 

+  <groupId>org.opendaylight.netconf</groupId>

   <artifactId>netconf-tools</artifactId>
   <artifactId>netconf-tools</artifactId>

+  <version>1.3.0-SNAPSHOT</version>

   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 

diff --git a/pom.xml b/pom.xml
index 42087923be03a1333e3023f3afaa977c955a8162..7085fbbf3fc827391ca08d1aab8a54be943681a8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,66 +30,6 @@
         <module>karaf</module>
     </modules>
 
         <module>karaf</module>
     </modules>
 

-    <properties>
-        <config.version>0.7.0-SNAPSHOT</config.version>
-        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-
-        <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
-        <netconf.version>1.3.0-SNAPSHOT</netconf.version>
-        <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    </properties>
-
-
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yangtools-artifacts</artifactId>
-            <version>${yangtools.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.mdsal</groupId>
-          <artifactId>mdsal-artifacts</artifactId>
-          <version>${mdsal.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.mdsal.model</groupId>
-          <artifactId>mdsal-model-artifacts</artifactId>
-          <version>${mdsal.model.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.aaa</groupId>
-          <artifactId>aaa-artifacts</artifactId>
-          <version>0.6.0-SNAPSHOT</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-artifacts</artifactId>
-          <version>${config.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>mdsal-artifacts</artifactId>
-          <version>${controller.mdsal.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-      </dependencies>
-    </dependencyManagement>
-

     <profiles>
         <profile>
             <id>integrationtests</id>
     <profiles>
         <profile>
             <id>integrationtests</id>

diff --git a/restconf/models/ietf-restconf-monitoring/pom.xml b/restconf/models/ietf-restconf-monitoring/pom.xml
index da693b1b06ca62f66cce188c2d2e6b1821c61e80..72dce295417d1d4b9738b836254529cb47a09f6e 100644 (file)
--- a/restconf/models/ietf-restconf-monitoring/pom.xml
+++ b/restconf/models/ietf-restconf-monitoring/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.11.0-SNAPSHOT</version>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.11.0-SNAPSHOT</version>

-        <relativePath>../../../binding/binding-parent</relativePath>
+        <relativePath/>

     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/restconf/models/ietf-restconf/pom.xml b/restconf/models/ietf-restconf/pom.xml
index af2dddf504ef339bd3230b46b726e74bdedc0135..8592df43127e51b510ee84c06558ae83c5bc7c6a 100644 (file)
--- a/restconf/models/ietf-restconf/pom.xml
+++ b/restconf/models/ietf-restconf/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.11.0-SNAPSHOT</version>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.11.0-SNAPSHOT</version>

-        <relativePath>../../../binding/binding-parent</relativePath>
+        <relativePath/>

     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/restconf/models/ietf-yang-library/pom.xml b/restconf/models/ietf-yang-library/pom.xml
index db8c7ce41cd135d7140ca90791cd2aa18111e621..dea433040af22bba648b64db591856a1154bc493 100644 (file)
--- a/restconf/models/ietf-yang-library/pom.xml
+++ b/restconf/models/ietf-yang-library/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.11.0-SNAPSHOT</version>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.11.0-SNAPSHOT</version>

-        <relativePath>../../../binding/binding-parent</relativePath>
+        <relativePath/>

     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/restconf/models/pom.xml b/restconf/models/pom.xml
index 74f2fc4df081988ae49da6dd4bd77027308dc069..6582e0d5c09b14c24ea985dbf250d0f39e04307d 100644 (file)
--- a/restconf/models/pom.xml
+++ b/restconf/models/pom.xml
@@ -10,12 +10,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>restconf-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>2.0.2</version>
+    <relativePath/>

   </parent>
 
   </parent>
 

+  <groupId>org.opendaylight.netconf</groupId>

   <artifactId>restconf-models</artifactId>
   <artifactId>restconf-models</artifactId>

+  <version>1.3.0-SNAPSHOT</version>

   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 4ed92263b966130c0baf25b934de84500837cd9a..c32e2c870378a4dd16135bd253272e17d035fe19 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -35,23 +35,4 @@
         <module>models</module>
     </modules>
 
         <module>models</module>
     </modules>
 

-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-parent</artifactId>
-                <version>1.3.0-SNAPSHOT</version>
-                <type>pom</type>
-               <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-

 </project>
 </project>

diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml
index 12a98fcbea11f225fa8cd4647440985de75af349..d64b24c51af3ec3bc4039b1e92ec7ce8abd610f0 100644 (file)
--- a/restconf/restconf-artifacts/pom.xml
+++ b/restconf/restconf-artifacts/pom.xml
@@ -66,13 +66,6 @@
                 <artifactId>sal-restconf-broker</artifactId>
                 <version>${project.version}</version>
             </dependency>
                 <artifactId>sal-restconf-broker</artifactId>
                 <version>${project.version}</version>
             </dependency>

-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-restconf</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>

 
             <!-- restconf features -->
             <dependency>
 
             <!-- restconf features -->
             <dependency>

diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml
index b15f4a5b2833b073598abb99c1891d793a712fe7..4e4d458e5f2d1741b85b58cb9ca66a7d1ce0085e 100644 (file)
--- a/restconf/sal-rest-connector/pom.xml
+++ b/restconf/sal-rest-connector/pom.xml
@@ -29,6 +29,28 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-artifacts</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+

       <dependency>
         <groupId>org.glassfish.jersey.test-framework.providers</groupId>
         <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
       <dependency>
         <groupId>org.glassfish.jersey.test-framework.providers</groupId>
         <artifactId>jersey-test-framework-provider-grizzly2</artifactId>

diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml
index 33a8d20e19e62bf8dd77a6a12f1173e0fc3198fd..0bd0fdd73fa313bf7c5aa43591887232131c483e 100644 (file)
--- a/restconf/sal-rest-docgen-maven/pom.xml
+++ b/restconf/sal-rest-docgen-maven/pom.xml
@@ -30,11 +30,10 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

-

             <dependency>
             <dependency>

-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-parent</artifactId>
-                <version>1.3.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>

                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml
index a123804d27dcbb52ef522b3f1812e11b7e039431..74734fe652a15d9890230b429439cf00a85a8dad 100644 (file)
--- a/restconf/sal-rest-docgen/pom.xml
+++ b/restconf/sal-rest-docgen/pom.xml
@@ -23,9 +23,16 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
   <dependencyManagement>
     <dependencies>
       <dependency>

-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>

         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>