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.1-Helium-SR1 to
  0.1.2-SNAPSHOT.
* Re-enables the feature tests for the restconf and netconf-conector
  features.

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

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 5da7cd345ecdcfb76cf080329966d264331584c7..76e9acdce3526649ab31b20d13260982ebcb5c47 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -162,14 +162,12 @@
       Optional TODO: Remove TODO comments.
     -->
     <!-- test to validate features.xml -->
-    <!-- TEMPORARILY DISABLE TO BREAK CYCLIC DEPENDENCY
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>
       <version>${yangtools.version}</version>
       <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 7abf01e0006a107e31bf00dddade04deba77b482..45b22cb22a08b917528d7b1b9cea9b03b6dbc5e7 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -255,14 +255,12 @@
       Optional TODO: Remove TODO comments.
     -->
     <!-- test to validate features.xml -->
-    <!-- TEMPORARILY DISABLE TO BREAK CYCLIC DEPENDENCY
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>
       <version>${yangtools.version}</version>
       <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 9bddff36b49626b507ddbcd336f907403972b7a4..fd18996d750bf7dd6a00be97414e81e58b7099cb 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -67,7 +67,7 @@
     <concepts.version>0.5.4-SNAPSHOT</concepts.version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
     <config.version>0.2.7-SNAPSHOT</config.version>
-    <aaa.version>0.1.1-Helium-SR1</aaa.version>
+    <aaa.version>0.1.2-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>