Add Karaf 4 distribution, fix initial config

- Add Karaf 4 distribution for testing to distribution/karaf4.
  This distribution will replace current distribution/karaf
  after support for Karaf 3 will be removed.
- Fix using Karaf 3 shell commands dependencies, and use
  correct ones based on Karaf version specified in distribution
- Fix copying of initial configuration file (wrong path of config
  .xml, was `src/main/features/features.xml` but corrected it to
  `src/main/feature/feature.xml`)

Resolves: bug 8693

Change-Id: I9d65f9a369e1f7750724a432e37cef944f9dcfb4
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 1a59f697bc8cc4340686f6f269a42877c3a7aafa..24929781a924d6ff72f6199e0d607f7ddaa8cf2a 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -162,6 +162,13 @@
                 <type>xml</type>
                 <classifier>config</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-blueprint-config</artifactId>
+                <version>${project.version}</version>
+                <type>cfg</type>
+                <classifier>config</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>openflowplugin-controller-config</artifactId>
@@ -226,6 +233,34 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features4-openflowplugin-he</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features4-openflowplugin</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features4-openflowplugin-extension-he</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features4-openflowplugin-extension</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>bulk-o-matic</artifactId>

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index f386451018900c1b9562234077cf2506d78bef2e..43228adacafc0e80312913ffbcc16b3104544e24 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -5,7 +5,6 @@
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf-parent</artifactId>
     <version>1.9.0</version>
-    <relativePath></relativePath>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>
@@ -18,6 +17,11 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.console</artifactId>
+        <version>${karaf.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-artifacts</artifactId>

diff --git a/distribution/karaf4/pom.xml b/distribution/karaf4/pom.xml
new file mode 100644 (file)
index 0000000..e490d4a
--- /dev/null
+++ b/distribution/karaf4/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>karaf4-parent</artifactId>
+    <version>1.9.0</version>
+  </parent>
+  <groupId>org.opendaylight.openflowplugin</groupId>
+  <artifactId>openflowplugin-karaf4</artifactId>
+  <version>0.5.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.console</artifactId>
+        <version>${karaf4.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-artifacts</artifactId>
+        <version>${openflowplugin.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <!-- scope is compile so all features (there is only one) are installed
+            into startup.properties and the feature repo itself is not installed -->
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>framework</artifactId>
+      <type>kar</type>
+    </dependency>
+    <!-- openflowplugin feature -->
+    <dependency>
+      <artifactId>features4-openflowplugin-he</artifactId>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <artifactId>features4-openflowplugin</artifactId>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <!-- openflowplugin extension feature -->
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features4-openflowplugin-extension-he</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features4-openflowplugin-extension</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- DO NOT deploy the karaf artifact -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
+</project>

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index 0609b4bcde7edda634f7c7bfe70ad0cb0e44f30f..9eb39473aba4308d6c68720d5cd856f486143845 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index 82ce0ad93fa2cdecca3f846cef58c247bd5ab59c..0a767efe8e00ce9f6c388de7706e0d1d0f2fa4f2 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -23,6 +23,14 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- This project -->
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>openflowplugin-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
             <!-- Controller infrastructure -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -47,7 +55,6 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-nsf-model</artifactId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
@@ -55,33 +62,54 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-common</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-impl</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>liblldp</artifactId>
             <version>${lldp.version}</version>
         </dependency>
+
+        <!-- config files -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <type>cfg</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-controller-config</artifactId>
+            <type>xml</type>
+            <classifier>configmsgspy</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-controller-config</artifactId>
+            <type>xml</type>
+            <classifier>config-Li</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-controller-config</artifactId>
+            <type>xml</type>
+            <classifier>config-He</classifier>
+        </dependency>
     </dependencies>
 
 </project>

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

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index c34dc24de0fce90ca86dd99a090a83386c30a7c1..088882a72a61d10ab921deab5a0026567ab2a870 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -136,7 +136,6 @@
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/pom.xml b/pom.xml
index 04c76fa8c4ef66e33105e8b24b7ea7028b5143e0..6cd28de59f2bfc213f4f9291b791d44cb31280ca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
       <module>openflowplugin-common</module>
       <module>extension</module>
       <module>distribution/karaf</module>
+      <module>distribution/karaf4</module>
       <module>openflowplugin-controller-config</module>
       <module>openflowplugin-blueprint-config-he</module>
       <module>openflowplugin-blueprint-config</module>