Move ietf-netconf-monitoring-extension

This is an implementation detail, let's make sure we treat it that way.

JIRA: NETCONF-891
Change-Id: I2de2dbf7c348f1790f9e2cec21db8b9cbfa0a2d2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7de87264be8e1bf97b2e76abe4f1e4357aaec279..9d1a9033c28f69f3f0ac43a0b4445773c7a63a13 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -180,13 +180,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- FIXME: NETCONF-891: replace this model -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring-extension</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- FIXME: place these models with their users -->
             <dependency>
                 <groupId>${project.groupId}</groupId>

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 0db7ea92e0676c134102b3e52257cec13e8a6bb1..e6c654c35a9e2b2c9089328581a49b31ce21b744 100644 (file)
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -54,10 +54,6 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-auth</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-monitoring-extension</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf.model</groupId>
             <artifactId>rfc5277</artifactId>

diff --git a/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
deleted file mode 100644 (file)
index 30749d2..0000000
--- a/netconf/models/ietf-netconf-monitoring-extension/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
-  </parent>
-
-  <artifactId>ietf-netconf-monitoring-extension</artifactId>
-  <name>${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.netconf.model</groupId>
-      <artifactId>rfc6022</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
deleted file mode 100644 (file)
index c64ac8f..0000000
--- a/netconf/models/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
-  -->
-<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.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>11.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>netconf-models</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-
-  <properties>
-    <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.install.skip>true</maven.install.skip>
-  </properties>
-
-  <modules>
-    <module>ietf-netconf-monitoring-extension</module>
-  </modules>
-</project>

diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index 861258dc86c04d700609f7e262a192179bb97336..e9955fe1886a5a1b766be4622547778900dc384b 100644 (file)
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -25,10 +25,6 @@
       <groupId>org.opendaylight.netconf.model</groupId>
       <artifactId>rfc6022</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-monitoring-extension</artifactId>
-    </dependency>
     <!-- compile dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/netconf/models/ietf-netconf-monitoring-extension/src/main/yang/ietf-netconf-monitoring-extension.yang b/netconf/netconf-impl/src/main/yang/ietf-netconf-monitoring-extension.yang
similarity index 100%
rename from netconf/models/ietf-netconf-monitoring-extension/src/main/yang/ietf-netconf-monitoring-extension.yang
rename to netconf/netconf-impl/src/main/yang/ietf-netconf-monitoring-extension.yang

diff --git a/netconf/pom.xml b/netconf/pom.xml
index cc524d80428e59477bf174c354ac482d20771866..c29e24a7c367ee34dbcc1aa289825952f964e510 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -52,7 +52,6 @@
     <module>netconf-topology-singleton</module>
     <module>sal-netconf-connector</module>
     <module>yanglib</module>
-    <module>models</module>
     <module>tools</module>
     <module>netconf-console</module>
 

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 46872f9ddda606398f6ca018e6aa0c3928aeb6a5..b894a54c264d810885f65ba4d6a8a515a2a73832 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -81,10 +81,6 @@
             <groupId>org.opendaylight.netconf.model</groupId>
             <artifactId>rfc6022</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-netconf-monitoring-extension</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>