Cleanup feature repositories

Eliminate per-protocol/per-layer feature repositories.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index e04000597053bbb951455bc695bfc3c980a5b40e..73c1ee074204af8905a0a2bdedd5049afaec08e1 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -389,13 +389,6 @@
             </dependency>
 
             <!-- netconf-connector features -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-netconf-connector</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-clustered-topology</artifactId>
@@ -447,13 +440,6 @@
             </dependency>
 
             <!-- yanglib features -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-yanglib</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-yanglib</artifactId>
@@ -524,13 +510,6 @@
             </dependency>
 
             <!-- restconf features -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-restconf</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-apidocs</artifactId>

diff --git a/features/features-netconf-testing/pom.xml b/features/features-netconf-testing/pom.xml
new file mode 100644 (file)
index 0000000..72b07bc
--- /dev/null
+++ b/features/features-netconf-testing/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2021 PANTHEON.tech, s.r.o. 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>feature-repo-parent</artifactId>
+      <version>12.0.5</version>
+      <relativePath/>
+  </parent>
+
+  <groupId>org.opendaylight.netconf</groupId>
+  <artifactId>features-netconf-testing</artifactId>
+  <version>6.0.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <dependencyManagement>
+      <dependencies>
+          <dependency>
+              <groupId>org.opendaylight.netconf</groupId>
+              <artifactId>netconf-artifacts</artifactId>
+              <version>${project.version}</version>
+              <scope>import</scope>
+              <type>pom</type>
+          </dependency>
+      </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+      <dependency>
+          <groupId>org.opendaylight.netconf</groupId>
+          <artifactId>features-netconf</artifactId>
+          <type>xml</type>
+          <classifier>features</classifier>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.netconf</groupId>
+          <artifactId>odl-netconf-test-tools</artifactId>
+          <type>xml</type>
+          <classifier>features</classifier>
+      </dependency>
+  </dependencies>
+</project>

diff --git a/features/features-netconf/pom.xml b/features/features-netconf/pom.xml
new file mode 100644 (file)
index 0000000..f69d8de
--- /dev/null
+++ b/features/features-netconf/pom.xml
@@ -0,0 +1,140 @@
+<?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.odlparent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>12.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>features-netconf</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-aaa-netconf-plugin</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-all</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-client</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-impl</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-mdsal</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-netty-util</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-util</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-clustered-topology</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-connector</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-connector-all</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-callhome-ssh</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-console</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-topology</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-mdsal-apidocs</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf-all</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
deleted file mode 100644 (file)
index 29192ce..0000000
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ /dev/null
@@ -1,80 +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.odlparent</groupId>
-    <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.5</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>features-netconf-connector</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <properties>
-    <!-- Skip SFT as some of the features are mutually exclusive, i.e. SFT may fail
-         if certain features are installed together. -->
-    <skip.karaf.featureTest>true</skip.karaf.featureTest>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${project.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-clustered-topology</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-connector</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-connector-all</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-callhome-ssh</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-console</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-topology</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
deleted file mode 100644 (file)
index 8577be2..0000000
--- a/features/netconf-connector/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- 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>12.0.5</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>features-netconf-connector-aggregator</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-
-    <modules>
-        <module>features-netconf-connector</module>
-        <module>odl-netconf-clustered-topology</module>
-        <module>odl-netconf-connector</module>
-        <module>odl-netconf-connector-all</module>
-        <module>odl-netconf-callhome-ssh</module>
-        <module>odl-netconf-console</module>
-        <module>odl-netconf-topology</module>
-    </modules>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
-    </scm>
-</project>

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
deleted file mode 100644 (file)
index d15dd4b..0000000
--- a/features/netconf/features-netconf-testing/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2021 PANTHEON.tech, s.r.o. 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>feature-repo-parent</artifactId>
-      <version>12.0.5</version>
-      <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>features-netconf-testing</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <dependencyManagement>
-      <dependencies>
-          <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>netconf-artifacts</artifactId>
-              <version>${project.version}</version>
-              <scope>import</scope>
-              <type>pom</type>
-          </dependency>
-      </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-aaa-netconf-plugin</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-all</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-api</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-client</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-impl</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-mdsal</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-netty-util</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-util</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
-  </dependencies>
-</project>

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
deleted file mode 100644 (file)
index dc0b579..0000000
--- a/features/netconf/features-netconf/pom.xml
+++ /dev/null
@@ -1,86 +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.odlparent</groupId>
-    <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.5</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>features-netconf</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${project.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-aaa-netconf-plugin</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-all</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-api</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-client</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-impl</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-mdsal</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-netty-util</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-util</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
deleted file mode 100644 (file)
index 82b0af5..0000000
--- a/features/netconf/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- 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>12.0.5</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>features-netconf-aggregator</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <properties>
-    <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.install.skip>true</maven.install.skip>
-  </properties>
-
-  <modules>
-    <module>features-netconf</module>
-    <module>odl-aaa-netconf-plugin</module>
-    <module>odl-netconf-all</module>
-    <module>odl-netconf-api</module>
-    <module>odl-netconf-client</module>
-    <module>odl-netconf-impl</module>
-    <module>odl-netconf-mdsal</module>
-    <module>odl-netconf-netty-util</module>
-    <module>odl-netconf-ssh</module>
-    <module>odl-netconf-util</module>
-
-    <!-- CSIT features -->
-    <module>features-netconf-testing</module>
-    <module>odl-netconf-test-tools</module>
-  </modules>
-
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/netconf</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=tree</url>
-  </scm>
-</project>

diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/odl-aaa-netconf-plugin/pom.xml
similarity index 89%
rename from features/netconf/odl-aaa-netconf-plugin/pom.xml
rename to features/odl-aaa-netconf-plugin/pom.xml
index ff8d83ad7fd7367d357eca14f48b843cc2236528..58eb9b00fe998683b445ea8b688bdf576bd1cab1 100644 (file)
--- a/features/netconf/odl-aaa-netconf-plugin/pom.xml
+++ b/features/odl-aaa-netconf-plugin/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-aaa-netconf-plugin</artifactId>
@@ -28,11 +28,11 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-auth</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-auth-aaa</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/netconf/odl-aaa-netconf-plugin/src/main/feature/feature.xml b/features/odl-aaa-netconf-plugin/src/main/feature/feature.xml
similarity index 100%
rename from features/netconf/odl-aaa-netconf-plugin/src/main/feature/feature.xml
rename to features/odl-aaa-netconf-plugin/src/main/feature/feature.xml

diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/odl-mdsal-apidocs/pom.xml
similarity index 96%
rename from features/restconf/odl-mdsal-apidocs/pom.xml
rename to features/odl-mdsal-apidocs/pom.xml
index b94e271bb232aed90d2c6527dbc9baa514756cc1..7bce83d5673e5dc762efd183eae682d8b9b92fe7 100644 (file)
--- a/features/restconf/odl-mdsal-apidocs/pom.xml
+++ b/features/odl-mdsal-apidocs/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-mdsal-apidocs</artifactId>

diff --git a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml b/features/odl-mdsal-apidocs/src/main/feature/feature.xml
similarity index 100%
rename from features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
rename to features/odl-mdsal-apidocs/src/main/feature/feature.xml

diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/odl-netconf-all/pom.xml
similarity index 84%
rename from features/netconf/odl-netconf-all/pom.xml
rename to features/odl-netconf-all/pom.xml
index 6b108b06668bb52741e1dceea99e3d6029774f66..ff11b0e2138e4d0b480a1c86052d62c1592b5daf 100644 (file)
--- a/features/netconf/odl-netconf-all/pom.xml
+++ b/features/odl-netconf-all/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-all</artifactId>
@@ -22,31 +22,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-netty-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-client</artifactId>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/odl-netconf-api/pom.xml
similarity index 98%
rename from features/netconf/odl-netconf-api/pom.xml
rename to features/odl-netconf-api/pom.xml
index 687c736baed72621778ad7bcd25b7b6e5bcd5d27..9cfef994b8ce65c5e710ee08fd5d90ac2465c114 100644 (file)
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/odl-netconf-api/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-api</artifactId>

diff --git a/features/netconf/odl-netconf-api/src/main/feature/feature.xml b/features/odl-netconf-api/src/main/feature/feature.xml
similarity index 100%
rename from features/netconf/odl-netconf-api/src/main/feature/feature.xml
rename to features/odl-netconf-api/src/main/feature/feature.xml

diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/odl-netconf-callhome-ssh/pom.xml
similarity index 84%
rename from features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
rename to features/odl-netconf-callhome-ssh/pom.xml
index 405b1fbd45f573b35d001a46b908f409f0848f73..7c7f3e72ec08c36414fc1ead66f76ae766ae9a1f 100644 (file)
--- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
+++ b/features/odl-netconf-callhome-ssh/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-callhome-ssh</artifactId>
@@ -23,21 +23,21 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-topology</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>callhome-model</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>callhome-protocol</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>callhome-provider</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/odl-netconf-client/pom.xml
similarity index 87%
rename from features/netconf/odl-netconf-client/pom.xml
rename to features/odl-netconf-client/pom.xml
index 77386e16c1f0388eba43eeb8fd30eb5aab23d684..fd30965b13b7d84266e822651e63b6ce5d71772f 100644 (file)
--- a/features/netconf/odl-netconf-client/pom.xml
+++ b/features/odl-netconf-client/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-client</artifactId>
@@ -27,17 +27,17 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-netty-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-config</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/netconf/odl-netconf-client/src/main/feature/feature.xml b/features/odl-netconf-client/src/main/feature/feature.xml
similarity index 100%
rename from features/netconf/odl-netconf-client/src/main/feature/feature.xml
rename to features/odl-netconf-client/src/main/feature/feature.xml

diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/odl-netconf-clustered-topology/pom.xml
similarity index 96%
rename from features/netconf-connector/odl-netconf-clustered-topology/pom.xml
rename to features/odl-netconf-clustered-topology/pom.xml
index 4497378336b43c3d2c34012897d14311b125f7ba..5dc32469aff268a48f75b753af6f954d1d61fb9f 100644 (file)
--- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml
+++ b/features/odl-netconf-clustered-topology/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-clustered-topology</artifactId>

diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/odl-netconf-connector-all/pom.xml
similarity index 88%
rename from features/netconf-connector/odl-netconf-connector-all/pom.xml
rename to features/odl-netconf-connector-all/pom.xml
index 755e01954559238bf89022916d39eba102ab015e..6fd5ead7d08c3e244ce87b87a6c71478e4e734a1 100644 (file)
--- a/features/netconf-connector/odl-netconf-connector-all/pom.xml
+++ b/features/odl-netconf-connector-all/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-connector-all</artifactId>
@@ -22,13 +22,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-connector</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-callhome-ssh</artifactId>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/odl-netconf-connector/pom.xml
similarity index 97%
rename from features/netconf-connector/odl-netconf-connector/pom.xml
rename to features/odl-netconf-connector/pom.xml
index af17ab993038ee6a5b4a39091abb29059d2e4cd1..49f8a5b1a3e3330ba70329ee2bcff55770df7265 100644 (file)
--- a/features/netconf-connector/odl-netconf-connector/pom.xml
+++ b/features/odl-netconf-connector/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-connector</artifactId>

diff --git a/features/netconf-connector/odl-netconf-connector/src/main/feature/feature.xml b/features/odl-netconf-connector/src/main/feature/feature.xml
similarity index 100%
rename from features/netconf-connector/odl-netconf-connector/src/main/feature/feature.xml
rename to features/odl-netconf-connector/src/main/feature/feature.xml

diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/odl-netconf-console/pom.xml
similarity index 97%
rename from features/netconf-connector/odl-netconf-console/pom.xml
rename to features/odl-netconf-console/pom.xml
index 4cd858d5ebab21d6be8e3d296b9136e4bda63b6a..2dfe7b729eaba4a7ea130ac9eaa60444e2b79bb1 100644 (file)
--- a/features/netconf-connector/odl-netconf-console/pom.xml
+++ b/features/odl-netconf-console/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-console</artifactId>

diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/odl-netconf-impl/pom.xml
similarity index 86%
rename from features/netconf/odl-netconf-impl/pom.xml
rename to features/odl-netconf-impl/pom.xml
index af053bd3c3d77186909a205c699f4c95eba6c4ad..9f836ebbc6e3a068c4a525b2751f15c995bb4e96 100644 (file)
--- a/features/netconf/odl-netconf-impl/pom.xml
+++ b/features/odl-netconf-impl/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-impl</artifactId>
@@ -28,25 +28,25 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-netty-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-server</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/netconf/odl-netconf-impl/src/main/feature/feature.xml b/features/odl-netconf-impl/src/main/feature/feature.xml
similarity index 100%
rename from features/netconf/odl-netconf-impl/src/main/feature/feature.xml
rename to features/odl-netconf-impl/src/main/feature/feature.xml

diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/odl-netconf-mdsal/pom.xml
similarity index 79%
rename from features/netconf/odl-netconf-mdsal/pom.xml
rename to features/odl-netconf-mdsal/pom.xml
index b25a14b3884c7a94cdf7773cf51637ed7400d4d1..f5f486e48b2abb6c4ebb30e4dadfe4f8d051aa68 100644 (file)
--- a/features/netconf/odl-netconf-mdsal/pom.xml
+++ b/features/odl-netconf-mdsal/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-mdsal</artifactId>
@@ -22,41 +22,41 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-client</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-aaa-netconf-plugin</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-server-mdsal</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-events-mdsal</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>mdsal-netconf-monitoring</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>mdsal-netconf-yang-library</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-nb</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/odl-netconf-netty-util/pom.xml
similarity index 90%
rename from features/netconf/odl-netconf-netty-util/pom.xml
rename to features/odl-netconf-netty-util/pom.xml
index a13bcbba14a18d1416c63524eaa9f5b6c7bbb5d5..7ea2a57e766238663fa48fe8628930838407caad 100644 (file)
--- a/features/netconf/odl-netconf-netty-util/pom.xml
+++ b/features/odl-netconf-netty-util/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-netty-util</artifactId>
@@ -43,19 +43,19 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-netty-util</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml b/features/odl-netconf-netty-util/src/main/feature/feature.xml
similarity index 100%
rename from features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
rename to features/odl-netconf-netty-util/src/main/feature/feature.xml

diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/odl-netconf-ssh/pom.xml
similarity index 88%
rename from features/netconf/odl-netconf-ssh/pom.xml
rename to features/odl-netconf-ssh/pom.xml
index f51aafa4b83871e9063faf3e3506d6661c86346e..e821eac315008c823ef33f5faf0a9d9d90b9ca7e 100644 (file)
--- a/features/netconf/odl-netconf-ssh/pom.xml
+++ b/features/odl-netconf-ssh/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-ssh</artifactId>
@@ -22,13 +22,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-aaa-netconf-plugin</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/netconf/odl-netconf-test-tools/pom.xml b/features/odl-netconf-test-tools/pom.xml
similarity index 97%
rename from features/netconf/odl-netconf-test-tools/pom.xml
rename to features/odl-netconf-test-tools/pom.xml
index 886b0deeeca0c0398466effc95a1cb74a9751a39..38fb6c99accfdf46c0843bb2a364bf466223b216 100644 (file)
--- a/features/netconf/odl-netconf-test-tools/pom.xml
+++ b/features/odl-netconf-test-tools/pom.xml
@@ -7,13 +7,13 @@
  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>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>odl-netconf-test-tools</artifactId>

diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/odl-netconf-topology/pom.xml
similarity index 96%
rename from features/netconf-connector/odl-netconf-topology/pom.xml
rename to features/odl-netconf-topology/pom.xml
index 904bfc00570079281ab75c592979d4004a514160..af7717eb3423815929a76495bdb32850d69a9a74 100644 (file)
--- a/features/netconf-connector/odl-netconf-topology/pom.xml
+++ b/features/odl-netconf-topology/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-topology</artifactId>

diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/odl-netconf-util/pom.xml
similarity index 96%
rename from features/netconf/odl-netconf-util/pom.xml
rename to features/odl-netconf-util/pom.xml
index 8a06830be16527a37fedfd35f5e3c0b3acfdcaa7..1310d9325b24b85a29b3167a5fb13f724af843c3 100644 (file)
--- a/features/netconf/odl-netconf-util/pom.xml
+++ b/features/odl-netconf-util/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-netconf-util</artifactId>

diff --git a/features/netconf/odl-netconf-util/src/main/feature/feature.xml b/features/odl-netconf-util/src/main/feature/feature.xml
similarity index 100%
rename from features/netconf/odl-netconf-util/src/main/feature/feature.xml
rename to features/odl-netconf-util/src/main/feature/feature.xml

diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/odl-restconf-all/pom.xml
similarity index 88%
rename from features/restconf/odl-restconf-all/pom.xml
rename to features/odl-restconf-all/pom.xml
index 621ecadc7bcd1fe5e35715b872844dcccda271be..71e8a9dca8425c9c2d0d7144f1471d917d149202 100644 (file)
--- a/features/restconf/odl-restconf-all/pom.xml
+++ b/features/odl-restconf-all/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-restconf-all</artifactId>
@@ -22,13 +22,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-mdsal-apidocs</artifactId>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/odl-restconf-common/pom.xml
similarity index 98%
rename from features/restconf/odl-restconf-common/pom.xml
rename to features/odl-restconf-common/pom.xml
index 897ae3f5418deb9345c6ec18ca8ac4b532ece5bd..6e87d63acdd43a85ec026cd6bdcb67fe864b205d 100644 (file)
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/odl-restconf-common/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-restconf-common</artifactId>

diff --git a/features/restconf/odl-restconf-common/src/main/feature/feature.xml b/features/odl-restconf-common/src/main/feature/feature.xml
similarity index 100%
rename from features/restconf/odl-restconf-common/src/main/feature/feature.xml
rename to features/odl-restconf-common/src/main/feature/feature.xml

diff --git a/features/restconf/odl-restconf-nb/pom.xml b/features/odl-restconf-nb/pom.xml
similarity index 97%
rename from features/restconf/odl-restconf-nb/pom.xml
rename to features/odl-restconf-nb/pom.xml
index c6063026186ff84f8f411d9abe5b1cff5f66af07..fc189ec0ebfa5a2ae5c2a45248d0a2bc9c6f9048 100644 (file)
--- a/features/restconf/odl-restconf-nb/pom.xml
+++ b/features/odl-restconf-nb/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-restconf-nb</artifactId>

diff --git a/features/restconf/odl-restconf-nb/src/main/feature/feature.xml b/features/odl-restconf-nb/src/main/feature/feature.xml
similarity index 100%
rename from features/restconf/odl-restconf-nb/src/main/feature/feature.xml
rename to features/odl-restconf-nb/src/main/feature/feature.xml

diff --git a/features/restconf/odl-restconf/pom.xml b/features/odl-restconf/pom.xml
similarity index 95%
rename from features/restconf/odl-restconf/pom.xml
rename to features/odl-restconf/pom.xml
index 554a05bfab02c484e3bd2a609717da75b6722ec9..2fad4ffa798e05e3b199f51aef05cd2f8357c0d4 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/odl-restconf/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-restconf</artifactId>

diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/odl-yanglib/pom.xml
similarity index 97%
rename from features/yanglib/odl-yanglib/pom.xml
rename to features/odl-yanglib/pom.xml
index 0e3dec604f2d28552254d7d09dda229a84d1347b..821011c3e625a0abc7f26557439e09c3382b1017 100644 (file)
--- a/features/yanglib/odl-yanglib/pom.xml
+++ b/features/odl-yanglib/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>feature-parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>odl-yanglib</artifactId>

diff --git a/features/yanglib/odl-yanglib/src/main/feature/feature.xml b/features/odl-yanglib/src/main/feature/feature.xml
similarity index 100%
rename from features/yanglib/odl-yanglib/src/main/feature/feature.xml
rename to features/odl-yanglib/src/main/feature/feature.xml

diff --git a/features/pom.xml b/features/pom.xml
index 9cf50cdabe6bda1fc7274c81af8e20b74f26f3a1..950f1235feb104ffe94909a27638c8436bfd7b91 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -7,30 +7,50 @@
  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>12.0.5</version>
-    <relativePath/>
-  </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>12.0.5</version>
+        <relativePath/>
+    </parent>
 
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>netconf-features-parent</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>netconf-features-parent</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.install.skip>true</maven.install.skip>
-  </properties>
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
 
-  <modules>
-    <module>parent</module>
-    <module>netconf</module>
-    <module>netconf-connector</module>
-    <module>restconf</module>
-    <module>yanglib</module>
-  </modules>
+    <modules>
+        <module>parent</module>
+        <module>features-netconf</module>
+        <module>features-netconf-testing</module>
 
+        <module>odl-aaa-netconf-plugin</module>
+        <module>odl-mdsal-apidocs</module>
+        <module>odl-netconf-all</module>
+        <module>odl-netconf-api</module>
+        <module>odl-netconf-callhome-ssh</module>
+        <module>odl-netconf-client</module>
+        <module>odl-netconf-clustered-topology</module>
+        <module>odl-netconf-connector-all</module>
+        <module>odl-netconf-connector</module>
+        <module>odl-netconf-console</module>
+        <module>odl-netconf-impl</module>
+        <module>odl-netconf-mdsal</module>
+        <module>odl-netconf-netty-util</module>
+        <module>odl-netconf-ssh</module>
+        <module>odl-netconf-test-tools</module>
+        <module>odl-netconf-topology</module>
+        <module>odl-netconf-util</module>
+        <module>odl-restconf-all</module>
+        <module>odl-restconf-common</module>
+        <module>odl-restconf</module>
+        <module>odl-restconf-nb</module>
+        <module>odl-yanglib</module>
+    </modules>
 </project>

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
deleted file mode 100644 (file)
index ac4dc25..0000000
--- a/features/restconf/features-restconf/pom.xml
+++ /dev/null
@@ -1,56 +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.odlparent</groupId>
-    <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.5</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>features-restconf</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${project.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-mdsal-apidocs</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-restconf</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-restconf-all</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
deleted file mode 100644 (file)
index 9573ae3..0000000
--- a/features/restconf/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- 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>12.0.5</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>features-restconf-aggregator</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-
-    <modules>
-        <module>features-restconf</module>
-        <module>odl-restconf-all</module>
-        <module>odl-mdsal-apidocs</module>
-        <module>odl-restconf</module>
-        <module>odl-restconf-common</module>
-        <module>odl-restconf-nb</module>
-    </modules>
-
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/netconf</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=tree</url>
-    </scm>
-</project>

diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
deleted file mode 100644 (file)
index 2208daf..0000000
--- a/features/yanglib/features-yanglib/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- 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.odlparent</groupId>
-        <artifactId>feature-repo-parent</artifactId>
-        <version>12.0.5</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>features-yanglib</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-yanglib</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
deleted file mode 100644 (file)
index ad135a3..0000000
--- a/features/yanglib/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- 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>12.0.5</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>features-yanglib-aggregator</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-
-    <modules>
-        <module>features-yanglib</module>
-        <module>odl-yanglib</module>
-    </modules>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
-    </scm>
-</project>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index b8c494d4385faa00d2783342e5d38e74ced88fd6..b80d7060ce13cc62b5b73b564f8791d997964e30 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -75,27 +75,6 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-yanglib</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-netconf-testing</artifactId>