Eliminate callhome-model artifact

Move the model into its sole user and eliminate the artifact.

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

diff --git a/apps/callhome-provider/pom.xml b/apps/callhome-provider/pom.xml
index 13337e4548551a925749039051145a7c175f68d1..40418e4cf52eec36d253b0ce7e3fcd00035a4c1b 100644 (file)
--- a/apps/callhome-provider/pom.xml
+++ b/apps/callhome-provider/pom.xml
@@ -77,10 +77,6 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>callhome-server</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>callhome-model</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-client-mdsal</artifactId>

diff --git a/netconf/callhome-model/src/main/yang/odl-netconf-callhome-server.yang b/apps/callhome-provider/src/main/yang/odl-netconf-callhome-server.yang
similarity index 100%
rename from netconf/callhome-model/src/main/yang/odl-netconf-callhome-server.yang
rename to apps/callhome-provider/src/main/yang/odl-netconf-callhome-server.yang

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8edbc87c1a542ef521884fa00f2b32f2c103b728..6e94b2b69c2288b598fa630799c5870bcd8617e7 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -289,11 +289,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-model</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>callhome-server</artifactId>

diff --git a/netconf/callhome-model/pom.xml b/netconf/callhome-model/pom.xml
deleted file mode 100644 (file)
index 2268430..0000000
--- a/netconf/callhome-model/pom.xml
+++ /dev/null
@@ -1,22 +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.netconf</groupId>
-        <artifactId>netconf-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <artifactId>callhome-model</artifactId>
-    <packaging>bundle</packaging>
-    <name>${project.artifactId}</name>
-</project>

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 62d08f5de90249fb168a0e87112ce6335abe4849..50bbe1b852a5979b50c4df624dd5c2f9ed3bff68 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -34,7 +34,6 @@
     <module>yanglib</module>
     <module>tools</module>
 
-    <module>callhome-model</module>
     <module>callhome-server</module>
 
     <module>netconf-test-models</module>