Re-enable tests and bump aaa version

This patch is part 2 of 2 patches:

* Increments the version of the depenency on AAA from 0.1.3-Helium-SR2
* to 0.1.4-SNAPSHOT.
* Re-enables the feature tests for the restconf and netconf-conector
  features.

Change-Id: I3a85ac10637d818126ff2543e3e39b22f36ecfea
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index f9e2ca2491d3dcac54ccb2cf2e87982389192e59..785d62cce59cedb321559358882d820870151da6 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -181,13 +181,11 @@
     -->
     <!-- 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)-->
-    <!-- TEMPORARILY DISABLE TO BREAK CYCLIC DEPENDENCY
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
       <scope>test</scope>
     </dependency>
-    -->
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 4f342826d12c2137b276e56968d505ed8c028dd9..197e2f70a8674a315356abbd75c06f378f5c655c 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -255,13 +255,11 @@
       Optional TODO: Remove TODO comments.
     -->
     <!-- test to validate features.xml -->
-    <!-- TEMPORARILY DISABLE TO BREAK CYCLIC DEPENDENCY
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
       <scope>test</scope>
     </dependency>
-    -->
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 0e493c85458c7d6d59fb37ca8f389cb9cdce2818..8d7e63edd43a7633a81bc52cff53124324e7a166 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -53,7 +53,7 @@
     <concepts.version>0.6.1-SNAPSHOT</concepts.version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
     <config.version>0.3.1-SNAPSHOT</config.version>
-    <aaa.version>0.2.0-Lithium</aaa.version>
+    <aaa.version>0.2.1-SNAPSHOT</aaa.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
     <config.netty.configfile>00-netty.xml</config.netty.configfile>