Merge "Breaking up 6360: Adding base features"

diff --combined opendaylight/commons/opendaylight/pom.xml
index aaab66d4b09ce655257de424b8510657dda93b1b,de66de8b08c5b8372b33004177212f3e3ecbb787..1020ba998c1e17a09026746e85370e84c21b0711
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -19,10 -19,11 +19,11 @@@
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
      <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
+     <aries.util.version>1.1.0</aries.util.version>
      <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
      <bouncycastle.version>1.50</bouncycastle.version>
 -    <bundle.plugin.version>2.3.7</bundle.plugin.version>
 +    <bundle.plugin.version>2.4.0</bundle.plugin.version>
      <bundlescanner.version>0.4.2-SNAPSHOT</bundlescanner.version>
      <checkstyle.version>2.10</checkstyle.version>
      <clustering.services.version>0.5.1-SNAPSHOT</clustering.services.version>
@@@ -52,11 -53,11 +53,11 @@@
      <eclipse.persistence.version>2.5.0</eclipse.persistence.version>
      <!-- enforcer version -->
      <enforcer.version>1.3.1</enforcer.version>
 -    <enunciate.version>1.26.2</enunciate.version>
 +    <enunciate.version>1.28</enunciate.version>
      <exam.version>3.0.0</exam.version>
  
      <!-- OpenEXI third party lib for netconf-->
 -    <exi.nagasena.version>0000.0002.0038.0-SNAPSHOT</exi.nagasena.version>
 +    <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
      <failsafe.version>2.15</failsafe.version>
      <feature.transaction.version>1.0.1</feature.transaction.version>
      <felix.dependencymanager.shell.version>3.0.1</felix.dependencymanager.shell.version>
@@@ -1339,6 -1340,16 +1340,6 @@@
          <artifactId>ganymed</artifactId>
          <version>1.1-SNAPSHOT</version>
        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller.thirdparty</groupId>
 -        <artifactId>nagasena</artifactId>
 -        <version>${exi.nagasena.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller.thirdparty</groupId>
 -        <artifactId>nagasena-rta</artifactId>
 -        <version>${exi.nagasena.version}</version>
 -      </dependency>
        <!-- Third parties from opendaylight released -->
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
@@@ -1473,16 -1484,6 +1474,16 @@@
          <artifactId>yang-ext</artifactId>
          <version>${yang-ext.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>org.openexi</groupId>
 +        <artifactId>nagasena</artifactId>
 +        <version>${exi.nagasena.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.openexi</groupId>
 +        <artifactId>nagasena-rta</artifactId>
 +        <version>${exi.nagasena.version}</version>
 +      </dependency>
        <dependency>
          <groupId>org.osgi</groupId>
          <artifactId>org.osgi.compendium</artifactId>
@@@ -1773,11 -1774,6 +1774,11 @@@
              <configFile>enunciate.xml</configFile>
            </configuration>
            <dependencies>
 +            <dependency>
 +              <groupId>org.codehaus.enunciate</groupId>
 +              <artifactId>enunciate-swagger</artifactId>
 +              <version>${enunciate.version}</version>
 +            </dependency>
              <dependency>
                <groupId>org.opendaylight.controller</groupId>
                <artifactId>commons.logback_settings</artifactId>

diff --combined opendaylight/distribution/opendaylight-karaf/pom.xml
index 1414fac2f33999f02ed9f5c7877530b51d47d7ac,33796390e0b4f86923fcd38ad2a4b1d9efcdd81a..377785ac41a21b4013587303cd64c68211baf1ea
--- 1/opendaylight/distribution/opendaylight-karaf/pom.xml
--- 2/opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/opendaylight/distribution/opendaylight-karaf/pom.xml
@@@ -22,18 -22,9 +22,17 @@@
        <version>${karaf.version}</version>
        <type>kar</type>
      </dependency>
 +    <dependency>
 +      <groupId>org.opendaylight.controller</groupId>
 +      <artifactId>config-features</artifactId>
 +      <version>${config.version}</version>
 +      <classifier>features</classifier>
 +      <type>xml</type>
 +      <scope>runtime</scope>
 +    </dependency>
      <!-- scope is runtime so the feature repo is listed in the features
        service config file, and features may be installed using the
        karaf-maven-plugin configuration -->
-     <!-- dependencies commented out till we can get them in
      <dependency>
        <groupId>org.apache.karaf.features</groupId>
        <artifactId>standard</artifactId>
@@@ -43,6 -34,23 +42,23 @@@
        <scope>runtime</scope>
      </dependency>
      <dependency>
+       <!-- scope is compile so all features (there is only one) are installed
+             into startup.properties and the feature repo itself is not installed -->
+       <groupId>org.opendaylight.controller</groupId>
+       <artifactId>base-features</artifactId>
+       <version>${project.version}</version>
+       <type>kar</type>
+       <scope>runtime</scope>
+     </dependency>
+     <!--<dependency>
+       <groupId>org.opendaylight.controller</groupId>
+       <artifactId>base-features</artifactId>
+       <version>${project.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+       <scope>runtime</scope>
+     </dependency>-->
+     <!-- <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>controller-features</artifactId>
        <version>${project.version}</version>
@@@ -50,15 -58,6 +66,15 @@@
        <type>xml</type>
        <scope>runtime</scope>
      </dependency>
 +  -->
 +    <dependency>
 +      <groupId>org.opendaylight.controller</groupId>
 +      <artifactId>mdsal-features</artifactId>
 +      <version>${mdsal.version}</version>
 +      <classifier>features</classifier>
 +      <type>xml</type>
 +      <scope>runtime</scope>
 +    </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>features-file</artifactId>
@@@ -67,6 -66,7 +83,6 @@@
        <type>xml</type>
        <scope>runtime</scope>
      </dependency>
 -  -->
    </dependencies>
  
    <build>