Add ALTO to Karaf 4 distribution

Patch set: trigger rebuild after fixing missing config
Patch set: use single features instead of aggregated features
Patch set: recheck

Change-Id: I5927dc9a4771f722d98979e72edfc24720f75b1f
Signed-off-by: Kai Gao <gaok12@mails.tsinghua.edu.cn>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 398aa6a6c026c9eca63b817d156e527dbfaf4497..d09404070b9ded45d989ed0e9c1f67459f09f334 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -59,6 +59,16 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- ALTO -->
+            <dependency>
+                <groupId>org.opendaylight.alto</groupId>
+                <artifactId>features4-alto</artifactId>
+                <version>${alto.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
+
             <!-- BIER -->
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 07d67294754e572de688deccd0de6d4429b5523c..1f0cbf40fc702555766113fb77fa0de56c75f95f 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -58,6 +58,43 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- ALTO -->
+            <dependency>
+                <groupId>org.opendaylight.alto</groupId>
+                <artifactId>odl-alto-simpleird</artifactId>
+                <version>${alto.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.alto</groupId>
+                <artifactId>odl-alto-manual-maps</artifactId>
+                <version>${alto.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.alto</groupId>
+                <artifactId>odl-alto-simpleecs</artifactId>
+                <version>${alto.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.alto</groupId>
+                <artifactId>odl-alto-auto-maps</artifactId>
+                <version>${alto.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.alto</groupId>
+                <artifactId>odl-alto-spce</artifactId>
+                <version>${alto.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- BIER -->
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 3ee0554382ba8b61a0b8214a25cb4eef2e755f68..311adf38602bd891251e3d485db5658ed54505d1 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -69,6 +69,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- ALTO -->
+        <dependency>
+            <groupId>org.opendaylight.alto</groupId>
+            <artifactId>features4-alto</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- BGPCEP -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index c7e6380ddc3e288f7431080134a9f9810e3b9a88..a6fce3a0a026b7fed15538eb3d897bc60fd7a0b9 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -62,6 +62,38 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- ALTO -->
+        <dependency>
+            <groupId>org.opendaylight.alto</groupId>
+            <artifactId>odl-alto-simpleird</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.alto</groupId>
+            <artifactId>odl-alto-manual-maps</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.alto</groupId>
+            <artifactId>odl-alto-simpleecs</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.alto</groupId>
+            <artifactId>odl-alto-auto-maps</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.alto</groupId>
+            <artifactId>odl-alto-spce</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- BGPCEP -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>