From: Tony Tkacik <ttkacik@cisco.com>
Date: Tue, 24 Feb 2015 08:26:05 +0000 (+0000)
Subject: Merge "Startup arch - feature cleanup"
X-Git-Tag: release/lithium~473^2~12
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=7435f945b84ace0a7e92093a425696ae8bf0da32;hp=-c

Merge "Startup arch - feature cleanup"
---

7435f945b84ace0a7e92093a425696ae8bf0da32
diff --combined opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
index 5ec5485723,398554c360..486e3d39ba
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
@@@ -24,7 -24,7 +24,7 @@@ and is available at http://www.eclipse.
      <maven>3.1.1</maven>
    </prerequisites>
    <properties>
-     <karaf.localFeature>odl-${artifactId}-impl-ui</karaf.localFeature>
+     <karaf.localFeature>odl-${artifactId}-ui</karaf.localFeature>
    </properties>
    <dependencyManagement>
      <dependencies>
@@@ -54,23 -54,4 +54,23 @@@
        <scope>runtime</scope>
      </dependency>
    </dependencies>
 +  <!-- DO NOT install or deploy the karaf artifact -->
 +  <build>
 +    <plugins>
 +      <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-deploy-plugin</artifactId>
 +        <configuration>
 +          <skip>true</skip>
 +        </configuration>
 +      </plugin>
 +      <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-install-plugin</artifactId>
 +        <configuration>
 +          <skip>true</skip>
 +        </configuration>
 +      </plugin>
 +    </plugins>
 +  </build>
  </project>