Adding alto features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/alto-verify-beryllium/37/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=alto.git;a=blob;f=alto-release-features/src/main/features/features.xml
	a) Feature Names: Prefixed with 'odl-' : odl-alto-realease
	b) Features Descriptions: Present
	c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-alto-release
	b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact - none

Patch Set 3: trigger another build

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

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 373e527fe426020c5b3d941af0567b0881d47de6..15dc3655af971e587fc1f630a4defa1daac0526e 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -44,15 +44,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!--
     <dependency>
       <groupId>org.opendaylight.alto</groupId>
-      <artifactId>features-alto</artifactId>
+      <artifactId>features-alto-release</artifactId>
       <version>0.2.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
--->
     <dependency>
       <groupId>org.opendaylight.armoury</groupId>
       <artifactId>armoury-features</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 69fe813b20ff415029da611eab6219ba5b27b32a..7b30a66be25814c72af1e20289f42494c7571f6b 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -33,9 +33,7 @@
     <repository>mvn:org.opendaylight.aaa/features-aaa/0.3.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-authz/0.3.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-api/0.3.0-SNAPSHOT/xml/features</repository>
-<!--
-    <repository>mvn:org.opendaylight.alto/features-alto/${feature.alto.version}/xml/features</repository>
--->
+    <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.armoury/armoury-features/${feature.armoury.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 34b67153a37db1d6f5797840b4f3506a2b734e90..2a6621a453dfce8f5e24424ef80c06399cd3c59b 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -63,9 +63,7 @@
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
-<!--
-        <feature version='${feature.alto.version}'>odl-alto-integration-test</feature>
--->
+        <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>