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.2.2-Lithium-SR2
* to 0.2.3-SNAPSHOT.
* Re-enables the feature tests for the restconf and netconf-conector
  features.

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

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 7116d56a27ba4ed762d87f423011a6b8c6885219..98053c4f8f9a0c6b170c4a7eb22b6f030b90e655 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 383ecc96eb1bdd770537464417f101a1b47c01e9..bc7e13d561aa739778911f7f9f7d9df031beee56 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -262,13 +262,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 b2db82a55ebf9b983d18f570da90e0ca0c80e23b..4266c9864c1b879d7ca2133c17aff4954ec51f66 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -53,7 +53,7 @@
     <concepts.version>0.6.3-SNAPSHOT</concepts.version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
     <config.version>0.3.3-SNAPSHOT</config.version>
-    <aaa.version>0.2.2-Lithium-SR2</aaa.version>
+    <aaa.version>0.2.3-SNAPSHOT</aaa.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
     <config.clustered-entity-ownership.configfile>06-clustered-entity-ownership.xml</config.clustered-entity-ownership.configfile>