X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Ffeatures%2Fnetconf-connector%2Fpom.xml;fp=features%2Fnetconf-connector%2Fpom.xml;h=731266c6d53d601fb3a0b8e66c1cf9b16c3fc74f;hp=8d4a5a81d34ebc5c58fdaf24728b6d93cf471c34;hb=23fe9ca678ada6263fec5dd996f4025e4a32fcf5;hpb=071a641d7c12c0e6112d5ce0afe806b54f116ed2

diff --git a/features/netconf-connector/pom.xml b/opendaylight/netconf/features/netconf-connector/pom.xml
similarity index 65%
rename from features/netconf-connector/pom.xml
rename to opendaylight/netconf/features/netconf-connector/pom.xml
index 8d4a5a81d3..731266c6d5 100644
--- a/features/netconf-connector/pom.xml
+++ b/opendaylight/netconf/features/netconf-connector/pom.xml
@@ -7,60 +7,21 @@
  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.controller</groupId>
-    <artifactId>sal-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/md-sal</relativePath>
-   </parent>
-   <!--
-    Necessary TODO: Hookup your parent pom here, else you will not get necessary versions,
-    maven repos etc.  If you run this archetype in a subdirectory of your project, it
-    will pick the pom.xml from the parent directory as the parent pom, which may or may
-    not be correct.
-  -->
+    <parent>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>netconf-subsystem</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
    <artifactId>features-netconf-connector</artifactId>
-   <!-- Optional TODO: Uncomment version if you are not using a parent pom.xml
-   <version>1.2.0-SNAPSHOT</version>
-   -->
+
+    <!-- Preserve mdsal version-->
+   <version>${mdsal.version}</version>
    <packaging>jar</packaging>
    <properties>
       <features.file>features.xml</features.file>
    </properties>
    <dependencies>
-    <!--
-      Necessary TODO: Put dependencies on any feature repos
-      you use in your features.xml file.
-
-      Note: they will need to be <type>xml</xml>
-      and <classifier>features</classifier>.
-      One other thing to watch for is to make sure they are
-      <scope>compile</compile>, which they should be by default,
-      but be cautious lest they be at a different scope in a parent pom.
-
-      Examples:
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>features-yangtools</artifactId>
-          <version>0.8.0-SNAPSHOT</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>features-mdsal</artifactId>
-          <version>1.3.0-SNAPSHOT</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>features-openflowplugin</artifactId>
-          <version>0.2.0-SNAPSHOT</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-    -->
     <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>features-yangtools</artifactId>
@@ -78,7 +39,6 @@
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>features-netconf</artifactId>
-          <version>${netconf.version}</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
@@ -89,24 +49,6 @@
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
-
-    <!--
-      Necessary TODO: Put dependencies for bundles directly referenced
-      in your features.xml file.  For every <bundle> reference in your
-      features.xml file, you need a corresponding dependency here.
-
-      Examples:
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controller-provider</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controller-model</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-    -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-netconf-connector</artifactId>
@@ -136,23 +78,6 @@
       <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
 
-
-     <!-- message-bus -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>messagebus-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>messagebus-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>messagebus-config</artifactId>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-connector-config</artifactId>
@@ -161,21 +86,6 @@
       <classifier>config</classifier>
     </dependency>
 
-    <!--
-      Necessary TODO: Put dependencies for configfiles directly referenced
-      in your features.xml file.  For every <configfile> reference in your
-      features.xml file, you need a corresponding dependency here.
-
-      Example (presuming here version is coming from the parent pom):
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controller-config</artifactId>
-        <version>${project.version}</version>
-        <type>xml</type>
-        <classifier>config</classifier>
-      </dependency>
-    -->
-
     <!--
       Optional TODO: Remove TODO comments.
     -->