Merge "Re-enable running of SingleFeaturesTest"

diff --combined features/mdsal/pom.xml
index 5559f9277585ded7ba0b77eb12c4b29a9e5dfd98,0cdd784a17a4cdffc82c7bed9c208125e23fff37..35edb286ab49a003389b9e2cf93b10d3123af674
--- 1/features/mdsal/pom.xml
--- 2/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@@ -246,15 -246,6 +246,15 @@@
        <artifactId>sal-inmemory-datastore</artifactId>
      </dependency>
  
 +      <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>mdsal-netconf-connector</artifactId>
 +      </dependency>
 +      <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>mdsal-netconf-monitoring</artifactId>
 +      </dependency>
 +
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-netconf-connector</artifactId>
@@@ -363,9 -354,8 +363,8 @@@
  
      <!-- test to validate features.xml -->
      <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
+       <groupId>org.opendaylight.odlparent</groupId>
        <artifactId>features-test</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
      </dependency>
    </dependencies>
  
@@@ -422,7 -412,7 +421,7 @@@
              <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
            </systemPropertyVariables>
            <dependenciesToScan>
-            <dependency>org.opendaylight.yangtools:features-test</dependency>
+            <dependency>org.opendaylight.odlparent:features-test</dependency>
            </dependenciesToScan>
          </configuration>
        </plugin>

diff --combined features/netconf-connector/pom.xml
index c69ee197be24dfa8db753ff96a99e13d37e186c3,8a209e5436668c501d238599acff71e1e6480f72..9cb2b1e33ffceaa6c20b92b0e67a5b601a30fe43
--- 1/features/netconf-connector/pom.xml
--- 2/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@@ -119,6 -119,10 +119,6 @@@
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>netconf-config-dispatcher</artifactId>
      </dependency>
 -    <dependency>
 -      <groupId>org.opendaylight.controller</groupId>
 -      <artifactId>mdsal-netconf-connector</artifactId>
 -    </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>netconf-tcp</artifactId>
@@@ -164,9 -168,8 +164,8 @@@
      <!-- test to validate features.xml -->
     <!--FIXME BUG-2195 When running single feature tests for netconf connector, features including ssh proxy server always fail (this behavior does not appear when running karaf distro directly)-->
      <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
+       <groupId>org.opendaylight.odlparent</groupId>
        <artifactId>features-test</artifactId>
-       <version>${yangtools.version}</version>
        <scope>test</scope>
      </dependency>
      <!-- dependency for opendaylight-karaf-empty for use by testing -->
@@@ -238,7 -241,7 +237,7 @@@
                  <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
                </systemPropertyVariables>
                <dependenciesToScan>
-                <dependency>org.opendaylight.yangtools:features-test</dependency>
+                <dependency>org.opendaylight.odlparent:features-test</dependency>
                </dependenciesToScan>
              </configuration>
            </plugin>

diff --combined opendaylight/commons/opendaylight/pom.xml
index cf4aa3140e0d828e9a85f9f0aa6440f7a8e71a94,5d7046a2df9bd622d0268328208fb129a167c800..7a977f954555160062b6be7814d1331a8c4690c6
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -81,6 -81,7 +81,7 @@@
      <!-- OpenEXI third party lib for netconf-->
      <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
      <felix.util.version>1.6.0</felix.util.version>
+     <features.test.version>1.5.0-SNAPSHOT</features.test.version>
      <filtervalve.version>1.5.0-SNAPSHOT</filtervalve.version>
      <findbugs.maven.plugin.version>2.4.0</findbugs.maven.plugin.version>
      <flowprogrammer.northbound.version>0.5.0-SNAPSHOT</flowprogrammer.northbound.version>
@@@ -104,6 -105,7 +105,6 @@@
      <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
      <jolokia-bridge.version>0.1.0-SNAPSHOT</jolokia-bridge.version>
      <jolokia.version>1.1.4</jolokia.version>
 -    <jsr305.api.version>2.0.1</jsr305.api.version>
      <jsr311.api.version>1.1.1</jsr311.api.version>
      <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
      <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
@@@ -286,6 -288,11 +287,6 @@@
          <artifactId>java-concurrent-hash-trie-map</artifactId>
          <version>${ctrie.version}</version>
        </dependency>
 -      <dependency>
 -        <groupId>com.google.code.findbugs</groupId>
 -        <artifactId>jsr305</artifactId>
 -        <version>${jsr305.api.version}</version>
 -      </dependency>
        <dependency>
          <groupId>com.google.code.gson</groupId>
          <artifactId>gson</artifactId>
@@@ -304,10 -311,9 +305,10 @@@
  
        <!-- 3rd party dependencies needed by config-->
        <dependency>
 -        <groupId>com.jcabi</groupId>
 -        <artifactId>jcabi-maven-slf4j</artifactId>
 -        <version>0.8</version>
 +        <groupId>org.apache.maven</groupId>
 +        <artifactId>maven-core</artifactId>
 +        <version>3.1.1</version>
 +        <scope>provided</scope>
        </dependency>
  
        <dependency>
@@@ -1189,6 -1195,12 +1190,12 @@@
          <version>${yangtools.version}</version>
          <scope>test</scope>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.odlparent</groupId>
+         <artifactId>features-test</artifactId>
+         <version>${features.test.version}</version>
+         <scope>test</scope>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>features-yangtools</artifactId>