Bug 7623: Genius' Karaf 4 features

see https://wiki.opendaylight.org/view/Karaf_4_migration

Change-Id: Ib33e4ad268e4e93ec340e483d7505a44c3a5fab6
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 5c7f8920cb714c755aea2257a9497e145b6dfee8..0d88a77ee385e68437a327d7e38d741d87c38705 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright © 2016 Ericsson India Global Services Pvt Ltd. 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">
+ Copyright © 2017 Red Hat, 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>1.8.0-SNAPSHOT</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <groupId>org.opendaylight.genius</groupId>
@@ -28,19 +27,54 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencyManagement>
     <dependencies>
+      <!-- Karaf 3 -->
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>genius-api</artifactId>
+        <artifactId>genius-features</artifactId>
         <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
       </dependency>
+
+      <!-- Karaf 4 -->
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>genius-impl</artifactId>
+        <artifactId>odl-genius-api</artifactId>
         <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>genius-features</artifactId>
+        <artifactId>odl-genius</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-genius-rest</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-genius-ui</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-genius-fcaps-framework</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-genius-fcaps-application</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>

diff --git a/commons/config-parent/pom.xml b/commons/config-parent/pom.xml
index bfeb24dad30b875b7067fb371c7dfc8ebfd2a456..9150666734c32e143ef4e9679de25d70f62f74ce 100644 (file)
--- a/commons/config-parent/pom.xml
+++ b/commons/config-parent/pom.xml
@@ -36,7 +36,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <genius.ovsdb.version>1.4.0-SNAPSHOT</genius.ovsdb.version>
     <genius.infrautils.version>1.1.0-SNAPSHOT</genius.infrautils.version>
     <liblldp.version>0.12.0-SNAPSHOT</liblldp.version>
-    <karaf.shell.console.version>3.0.3</karaf.shell.console.version>
   </properties>
 
   <dependencyManagement>

diff --git a/features/features4-genius/pom.xml b/features/features4-genius/pom.xml
new file mode 100644 (file)
index 0000000..8a34699
--- /dev/null
+++ b/features/features4-genius/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, 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>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.genius</groupId>
+  <artifactId>features4-genius</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>genius-artifacts</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-genius-api</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-genius</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-genius-rest</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-genius-ui</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-genius-fcaps-framework</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-genius-fcaps-application</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/genius-features/pom.xml b/features/genius-features/pom.xml
index 7ef2d54891e9c3517251baa89547fcd2d0116c22..965f568c0f9744a16437eae3314515edfc039675 100644 (file)
--- a/features/genius-features/pom.xml
+++ b/features/genius-features/pom.xml
@@ -135,7 +135,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>
       <classifier>features</classifier>
-      <version>${restconf.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
@@ -269,7 +268,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
-      <version>1</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
new file mode 100644 (file)
index 0000000..c94b9d6
--- /dev/null
+++ b/features/odl-genius-api/pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, 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>single-feature-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.genius</groupId>
+  <artifactId>odl-genius-api</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: genius :: API</name>
+
+  <dependencies>
+    <!-- Other Features -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>odl-mdsal-broker</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>odl-mdsal-models</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-southbound-api</artifactId>
+      <version>1.4.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-hwvtepsouthbound-api</artifactId>
+      <version>1.4.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-nsf-model</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>odl-infrautils-counters</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>odl-infrautils-inject</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+
+    <!-- Libraries from other projects -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>liblldp</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+
+    <!-- Bundles from this project -->
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>lockmanager-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>idmanager-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>mdsalutil-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>arputil-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>alivenessmonitor-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>interfacemanager-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>itm-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>resourcemanager-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml
new file mode 100644 (file)
index 0000000..79523a7
--- /dev/null
+++ b/features/odl-genius-fcaps-application/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, 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>single-feature-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.genius</groupId>
+  <artifactId>odl-genius-fcaps-application</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: genius :: fcapsapp</name>
+
+  <dependencies>
+    <!-- Other Features -->
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-flow-services</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>odl-infrautils-inject</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+
+    <!-- External libraries to wrap -->
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+
+    <!-- Bundles from this project -->
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>fcapsapplication-jmxapi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>fcapsapplication-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-genius-fcaps-framework/pom.xml b/features/odl-genius-fcaps-framework/pom.xml
new file mode 100644 (file)
index 0000000..ea69936
--- /dev/null
+++ b/features/odl-genius-fcaps-framework/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, 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>single-feature-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.genius</groupId>
+  <artifactId>odl-genius-fcaps-framework</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: genius :: fcapsframework</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>odl-mdsal-broker</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <!-- Bundles from this project -->
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>fcaps-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>alarmmanager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>countermanager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-genius-rest/pom.xml b/features/odl-genius-rest/pom.xml
new file mode 100644 (file)
index 0000000..0b7f8da
--- /dev/null
+++ b/features/odl-genius-rest/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, 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>single-feature-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.genius</groupId>
+  <artifactId>odl-genius-rest</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: genius :: REST</name>
+
+  <dependencies>
+    <!-- Other Features -->
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>odl-genius</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-restconf</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-genius-ui/pom.xml b/features/odl-genius-ui/pom.xml
new file mode 100644 (file)
index 0000000..8afa69f
--- /dev/null
+++ b/features/odl-genius-ui/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, 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>single-feature-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.genius</groupId>
+  <artifactId>odl-genius-ui</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: genius :: UI</name>
+
+  <dependencies>
+    <!-- Other Features -->
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>odl-genius-rest</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-mdsal-apidocs</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dluxapps</groupId>
+      <artifactId>odl-dluxapps-yangman</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml
new file mode 100644 (file)
index 0000000..ea79fba
--- /dev/null
+++ b/features/odl-genius/pom.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, 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>single-feature-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.genius</groupId>
+  <artifactId>odl-genius</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: genius :: Impls</name>
+
+  <!-- TODO Replace all <properties> by dependencyManagement <scope>import of respective upstream project -->
+  <properties>
+    <openflowplugin.version>0.4.0-SNAPSHOT</openflowplugin.version>
+    <ovsdb.version>1.4.0-SNAPSHOT</ovsdb.version>
+    <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+    <dluxapps.version>0.5.0-SNAPSHOT</dluxapps.version>
+    <liblldp.version>0.12.0-SNAPSHOT</liblldp.version>
+    <infrautils.version>1.1.0-SNAPSHOT</infrautils.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>genius-artifacts</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <!-- Other Features -->
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>odl-genius-api</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-southbound-impl</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>odl-ovsdb-hwvtepsouthbound</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-southbound</artifactId>
+      <version>${openflowplugin.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>odl-openflowplugin-flow-services</artifactId>
+      <version>${openflowplugin.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>odl-infrautils-counters</artifactId>
+      <version>${infrautils.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>odl-infrautils-inject</artifactId>
+      <version>${infrautils.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+
+    <!-- Libraries from other projects -->
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>utils.southbound-utils</artifactId>
+      <version>${ovsdb.version}</version>
+    </dependency>
+
+    <!-- External libraries to wrap -->
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+
+    <!-- Bundles from this project -->
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>lockmanager-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>idmanager-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>idmanager-shell</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>mdsalutil-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>arputil-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>alivenessmonitor-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>alivenessmonitor-impl-protocols</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>interfacemanager-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>interfacemanager-shell</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>itm-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>resourcemanager-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-genius/src/main/feature/features.xml b/features/odl-genius/src/main/feature/features.xml
new file mode 100644 (file)
index 0000000..c792b1c
--- /dev/null
+++ b/features/odl-genius/src/main/feature/features.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-genius-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+
+  <feature name='odl-genius' version='${project.version}'>
+    <configfile
+      finalname="etc/opendaylight/datastore/initial/config/genius-itm-config.xml">mvn:org.opendaylight.genius/itm-impl/${project.version}/xml/config</configfile>
+  </feature>
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index 2f9df735e4175f1e7afcc82b9f1826d2082a5fb2..28be940486b62d6752c8d93a03b820c206f61ffb 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -27,14 +27,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <modules>
         <module>genius-features</module>
-        <!--
-        <module>genius-features4</module>
         <module>odl-genius-api</module>
         <module>odl-genius</module>
         <module>odl-genius-rest</module>
         <module>odl-genius-ui</module>
         <module>odl-genius-fcaps-framework</module>
         <module>odl-genius-fcaps-application</module>
-        -->
+        <module>features4-genius</module>
     </modules>
 </project>

diff --git a/idmanager/idmanager-shell/pom.xml b/idmanager/idmanager-shell/pom.xml
index 89ef38d5f18ff8074c952238e640fc159d37d6c5..16695ebcc5c529f1b5f73136234174f0490b8c65 100644 (file)
--- a/idmanager/idmanager-shell/pom.xml
+++ b/idmanager/idmanager-shell/pom.xml
@@ -6,7 +6,8 @@ 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">
+<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">
 
   <parent>
     <groupId>org.opendaylight.genius</groupId>
@@ -33,14 +34,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf.shell.console.version}</version>
-   </dependency>
-   <dependency>
+    </dependency>
+    <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>mdsalutil-api</artifactId>
       <version>${genius.version}</version>
-   </dependency>
+    </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -50,6 +51,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
         </configuration>
       </plugin>
+      <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/idmanager/idmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/idmanager/idmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml
similarity index 100%
rename from idmanager/idmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml
rename to idmanager/idmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml

diff --git a/interfacemanager/interfacemanager-shell/pom.xml b/interfacemanager/interfacemanager-shell/pom.xml
index 190f780041573c1a5f28dd7f2a75cb7fb7344de3..612b0ddbf37dfea0a58ee62e4404aecb4c0c895a 100644 (file)
--- a/interfacemanager/interfacemanager-shell/pom.xml
+++ b/interfacemanager/interfacemanager-shell/pom.xml
@@ -38,7 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf.shell.console.version}</version>
    </dependency>
   </dependencies>
   <build>
@@ -50,6 +49,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
         </configuration>
       </plugin>
+      <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/itm/itm-api/pom.xml b/itm/itm-api/pom.xml
index 21bb5891f7688f398cb515ebd03864e7053f80bc..1e135c5c02a815fef5ee538ed24c78c0b48827b2 100644 (file)
--- a/itm/itm-api/pom.xml
+++ b/itm/itm-api/pom.xml
@@ -34,7 +34,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf.shell.console.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index 8cde3f0e348cfc6c93213b56f5f3fb3401671d6a..abec606fbc6a187cdb3eda24ef6909d78a87d3ae 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -176,6 +176,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
         </configuration>
       </plugin>
+      <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>