Increment the AAA dependency by 0.1.0 for post-Helium master branch

This patch is the second half of the post-Helium version bump patch. It
does two things:
* Increments the version of the depenency on AAA from 0.1.0-SNAPSHOT to
  0.2.0-SNAPSHOT.
* Re-enables the feature tests for the restconf and netconf-conector
  features.

Change-Id: I3160e429a4368ee142a41deb23631f6c1455d358
Signed-off-by: Colin Dixon <colin@colindixon.com>

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 6812076aa016185f4181f9a20f20b23706020a35..03d6fed6055d74ba4845a93be457fd3761720aa9 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -162,13 +162,12 @@
       Optional TODO: Remove TODO comments.
     -->
     <!-- test to validate features.xml -->
-    <!-- THIS IS A HORRIBLE IDEA, BUT NECESSARY TO BREAK A CYCLIC DEPENDENCY
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>
       <version>${yangtools.version}</version>
       <scope>test</scope>
-    </dependency> -->
+    </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 0a355d183fdc255903ff8531faa431ea099529ea..632b4cd592277304b70e832a093853881e360ecd 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -255,13 +255,12 @@
       Optional TODO: Remove TODO comments.
     -->
     <!-- test to validate features.xml -->
-    <!-- THIS IS A HORRIBLE IDEA, BUT NECESSARY TO BREAK A CYCLIC DEPENDENCY
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>
       <version>${yangtools.version}</version>
       <scope>test</scope>
-    </dependency> -->
+    </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 58de0ad56660af59dfc86ca698984ca4d0cb1d21..77fad0a9f75ba76ab57863e7dcb3f7fa43b3e0bb 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -67,7 +67,7 @@
     <concepts.version>0.6.0-SNAPSHOT</concepts.version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
     <config.version>0.3.0-SNAPSHOT</config.version>
-    <aaa.version>0.1.0-SNAPSHOT</aaa.version>
+    <aaa.version>0.2.0-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>