From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Fri, 23 Jun 2017 16:50:07 +0000 (-0400)
Subject: Bug 8735:  Remove dlux deps from startup archetype
X-Git-Tag: release/nitrogen~88
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=e7574c267bf058d1af2d0343e2a3d525742d79ff

Bug 8735:  Remove dlux deps from startup archetype

Since dlux is in maintenance mode, remove the dlux dependency from
the opendaylight-startup-archetype and remove the corresponding
-ui feature.

Change-Id: I78f43b90d718a10e47de99d54cd4952acc699470
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
index cd39f56d5e..f481b7796b 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
@@ -33,7 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
     <restconf.version>1.6.0-SNAPSHOT</restconf.version>
     <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
@@ -94,14 +93,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>${symbol_dollar}{project.groupId}</groupId>
       <artifactId>${artifactId}-impl</artifactId>
diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
index b744ad73d0..97d13a3275 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
@@ -17,7 +17,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
   <feature name='odl-${artifactId}-api' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: api'>
     <feature version='${symbol_dollar}{mdsal.model.version}'>odl-mdsal-models</feature>
     <bundle>mvn:${groupId}/${artifactId}-api/{{VERSION}}</bundle>
@@ -31,11 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version="${symbol_dollar}{project.version}">odl-${artifactId}</feature>
     <feature version="${symbol_dollar}{restconf.version}">odl-restconf</feature>
   </feature>
-  <feature name='odl-${artifactId}-ui' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: UI'>
-    <feature version="${symbol_dollar}{project.version}">odl-${artifactId}-rest</feature>
-    <feature version="${symbol_dollar}{restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${symbol_dollar}{dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
   <feature name='odl-${artifactId}-cli' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: CLI'>
     <feature version="${symbol_dollar}{project.version}">odl-${artifactId}</feature>
     <bundle>mvn:${groupId}/${artifactId}-cli/{{VERSION}}</bundle>