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

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

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index d93c385a81cac880c18fe13e031415b30fe7757a..16ac64cb3326e6f40823771ac1eba65aa1a68779 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 63fc1d5334e52bf9673fac0a9f50094319a3a93c..c6090210b4d1a5a8d2ec075915d423fa86f349cf 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 0f7428828981145f1eb8b0cb7a8c1cbae6682145..b9a8c77ee1e2a465ee806c27333c9db3e8be8bd8 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -53,7 +53,7 @@
     <concepts.version>0.6.4-SNAPSHOT</concepts.version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
     <config.version>0.3.4-SNAPSHOT</config.version>
-    <aaa.version>0.2.3-Lithium-SR3</aaa.version>
+    <aaa.version>0.2.4-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>