Remove Karaf4 useless features

Change-Id: I02496ac1574d2094eb937fa995cad251ec94cafc
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/cli/pom.xml b/cli/pom.xml
deleted file mode 100644 (file)
index d339097..0000000
--- a/cli/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2016 Orange 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.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.transportpce</groupId>
-  <artifactId>transportpce-cli</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Apache Karaf console dependency -->
-    <dependency>
-      <groupId>org.apache.karaf.shell</groupId>
-      <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.karaf.shell</groupId>
-      <artifactId>org.apache.karaf.shell.table</artifactId>
-      <version>${karaf.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index 25e70765bb877e6b3a0bfebc2bd9d69409b0bb74..8c3d652b0b78deb194bb2e37fd739dc1d8ccac8f 100644 (file)
--- a/features/features-transportpce/pom.xml
+++ b/features/features-transportpce/pom.xml
@@ -50,20 +50,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-rest</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-ui</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-transportpce-inventory</artifactId>

diff --git a/features/odl-transportpce-cli/pom.xml b/features/odl-transportpce-cli/pom.xml
deleted file mode 100644 (file)
index d859b28..0000000
--- a/features/odl-transportpce-cli/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 Orange 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 INTERNAL
--->
-<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>single-feature-parent</artifactId>
-    <version>3.1.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.transportpce</groupId>
-  <artifactId>odl-transportpce-cli</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <properties>
-    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
-    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
-    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
-    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-
-  <name>OpenDaylight :: transportpce :: CLI</name>
-
-  <dependencies>
-   <dependency>
-     <groupId>org.opendaylight.transportpce</groupId>
-     <artifactId>odl-transportpce</artifactId>
-     <version>${project.version}</version>
-     <classifier>features</classifier>
-     <type>xml</type>
-   </dependency>
-   <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-cli</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-     <plugins>
-     <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <!-- This bundle works with Karaf 3 and 4.0, see https://wiki.opendaylight.org/view/Karaf_4_migration#Karaf_CLI_commands -->
-           <Import-Package>
-             org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
-             org.apache.karaf.shell.console;version="[3.0.0,4.1)",
-             *
-           </Import-Package>
-         </instructions>
-       </configuration>
-     </plugin>
-   </plugins>
-  </build>
-</project>

diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index d1f46e53d9a44caaacc06f781f61cf64899792bf..f713b1f18f7b0ee46ce4d9482dab7f19f80840ed 100644 (file)
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -37,13 +37,6 @@
             <artifactId>transportpce-inventory</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>odl-transportpce-ui</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/features/odl-transportpce-rest/pom.xml b/features/odl-transportpce-rest/pom.xml
deleted file mode 100644 (file)
index 4d1ff66..0000000
--- a/features/odl-transportpce-rest/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 Orange 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 INTERNAL
--->
-<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>single-feature-parent</artifactId>
-    <version>3.1.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.transportpce</groupId>
-  <artifactId>odl-transportpce-rest</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <properties>
-    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
-  </properties>
-
-  <name>OpenDaylight :: transportpce :: REST</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-restconf</artifactId>
-      <version>${restconf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.transportpce</groupId>
-      <artifactId>odl-transportpce</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-  </dependencies>
-
-<!-- skipping test since this is an umbrella project / folder -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

diff --git a/features/odl-transportpce-ui/pom.xml b/features/odl-transportpce-ui/pom.xml
deleted file mode 100644 (file)
index aac5d78..0000000
--- a/features/odl-transportpce-ui/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 Orange 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 INTERNAL
--->
-<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>single-feature-parent</artifactId>
-    <version>3.1.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.transportpce</groupId>
-  <artifactId>odl-transportpce-ui</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <properties>
-    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
-  </properties>
-
-  <name>OpenDaylight :: transportpce :: UI</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.transportpce</groupId>
-      <artifactId>odl-transportpce-rest</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-mdsal-apidocs</artifactId>
-      <version>${mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/features/pom.xml b/features/pom.xml
index d1b690d710602a6b8675361d86f946fcac7f1dfc..23242338ad6d0c54d1f4fde1c385fa9ada49a5a1 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -28,9 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <module>odl-transportpce-ordmodels</module>
     <module>odl-transportpce-stubmodels</module>
     <module>odl-transportpce</module>
-    <module>odl-transportpce-ui</module>
     <module>odl-transportpce-inventory</module>
-    <module>odl-transportpce-rest</module>
   </modules>
 
 </project>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 1555d36a75e86dca3c2114eaa36a021c37cf08fb..0870992420085468383f3a07039ff85563a2357c 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>pom</packaging>
 
     <properties>
-        <karaf.localFeature>odl-transportpce-ui</karaf.localFeature>
+        <karaf.localFeature>odl-transportpce</karaf.localFeature>
         <device.yang.jar.extract.directory>
             ${project.build.outputDirectory}/../yang-models/schema
         </device.yang.jar.extract.directory>