Integrate features-akka into features-odlparent

We do not need a separate feature repository for akka, just
integrate it into features-odlparent.

JIRA: ODLPARENT-195
Change-Id: If03312353506d8b83e4b9350ab83433bc8dadcaf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/NEWS.rst b/NEWS.rst
index 67822e5dc719716aaf5dd8eacabfca9637ee1f75..0958b69a4cc5f26a9d1bea876098ac104e7e3ed7 100644 (file)
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -56,6 +56,8 @@ Removed features
 
 * odl-jersey-1
 
+* ``features-akka`` feature repository has been integrated into ``features-odlparent``
+
 Third-party dependencies
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/features/features-akka/pom.xml b/features/features-akka/pom.xml
deleted file mode 100644 (file)
index 9eb09e9..0000000
--- a/features/features-akka/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016 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>5.0.0-SNAPSHOT</version>
-        <relativePath>../../feature-repo-parent</relativePath>
-    </parent>
-
-    <artifactId>features-akka</artifactId>
-    <packaging>feature</packaging>
-
-    <name>ODL :: odlparent :: ${project.artifactId}</name>
-    <description>Akka.io features</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-all</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-scala-2.12</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-system-2.5</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-clustering-2.5</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-leveldb-0.10</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-persistence-2.5</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index fd17655e8c321f896184b7fe7b3a81a4b7b73805..33c2950ab07eb08e776b371331fafc9ee3369067 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -25,6 +25,43 @@
     <description>OpenDaylight third-party features</description>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-akka-all</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-akka-scala-2.12</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-akka-system-2.5</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-akka-clustering-2.5</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-akka-leveldb-0.10</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-akka-persistence-2.5</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-antlr4</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index 37728940432ea001faa572c120c7d57486c296b5..f1216cc138684991feb9da6d307a3c1b21c0ccd3 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -28,16 +28,6 @@
     </properties>
 
     <modules>
-        <!-- Akka features -->
-        <module>features-akka</module>
-        <module>odl-akka-all</module>
-        <module>odl-akka-clustering-2.5</module>
-        <module>odl-akka-leveldb-0.7</module>
-        <module>odl-akka-leveldb-0.10</module>
-        <module>odl-akka-persistence-2.5</module>
-        <module>odl-akka-scala-2.12</module>
-        <module>odl-akka-system-2.5</module>
-
         <!-- Proxy features for Karaf-provided features -->
         <module>odl-karaf-feat-feature</module>
         <module>odl-karaf-feat-jdbc</module>
@@ -46,6 +36,13 @@
 
         <!-- General features -->
         <module>features-odlparent</module>
+        <module>odl-akka-all</module>
+        <module>odl-akka-clustering-2.5</module>
+        <module>odl-akka-leveldb-0.7</module>
+        <module>odl-akka-leveldb-0.10</module>
+        <module>odl-akka-persistence-2.5</module>
+        <module>odl-akka-scala-2.12</module>
+        <module>odl-akka-system-2.5</module>
         <module>odl-antlr4</module>
         <module>odl-apache-commons-codec</module>
         <module>odl-apache-commons-lang3</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index a162decb22c673d2ef89f9ac6809db523d36540d..a0ccf446b8e3aa51bd7f1c340c26bbb04c83a336 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -56,13 +56,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features-akka</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-akka-all</artifactId>