Bumping versions by 0.0.1 for next dev cycle 95/23295/2
authorThanh Ha <thanh.ha@linuxfoundation.org>
Thu, 25 Jun 2015 18:29:35 +0000 (14:29 -0400)
committerThanh Ha <thanh.ha@linuxfoundation.org>
Thu, 25 Jun 2015 22:19:49 +0000 (18:19 -0400)
This patch is part 1 of 2 patches.

* To break the cyclic dependency, this patch temporarily stops running
  the authz feature tests.

Change-Id: I059c96be0f702a98df11ba7c85ed2db96861cfcd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
28 files changed:
aaa-authn-api/pom.xml
aaa-authn-basic/pom.xml
aaa-authn-federation/pom.xml
aaa-authn-keystone/pom.xml
aaa-authn-mdsal-store/aaa-authn-mdsal-api/pom.xml
aaa-authn-mdsal-store/aaa-authn-mdsal-config/pom.xml
aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
aaa-authn-mdsal-store/pom.xml
aaa-authn-odl-plugin/pom.xml
aaa-authn-sssd/pom.xml
aaa-authn-store/pom.xml
aaa-authn-sts/pom.xml
aaa-authn/pom.xml
aaa-authz/aaa-authz-config/pom.xml
aaa-authz/aaa-authz-model/pom.xml
aaa-authz/aaa-authz-restconf-config/pom.xml
aaa-authz/aaa-authz-service/pom.xml
aaa-authz/pom.xml
aaa-credential-store-api/pom.xml
aaa-idmlight/pom.xml
aaa-idp-mapping/pom.xml
commons/parent/pom.xml
distribution-karaf/pom.xml
features/api/pom.xml
features/authn/pom.xml
features/authz/pom.xml
features/pom.xml
pom.xml

index 2cfcc6faa58da270ba9cc3911ef9c9791667c078..3ffbb5ea90daf7b9451b4c6684ec8240333d7630 100644 (file)
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa.project</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>aaa-authn-api</artifactId>
-  <version>0.2.0-Lithium</version>
+  <version>0.2.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
index acfb4aafc5bb3e1b8d017658794c55fe4aa084e3..e3fdbf1a3e70cd9295184e1694069de63a1e086c 100644 (file)
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-authn-basic</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
index 41dbdf023eadad890875e7be6382e611a9ef33fd..5dc3df124cf87fd1bd64a40f9a367a10975b5d55 100644 (file)
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-authn-federation</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
index 1e75425f23fe27fe842bcac2a923804f90c5fd75..d6b6420127dc8f28a0530b8bc3b07aa9f1ea482e 100644 (file)
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-authn-keystone</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
index 22130e55a5affdb2b1a4408f971a1675abc0c1a0..869a7876acfb10ce4c71526a0e8318489678b798 100644 (file)
@@ -7,12 +7,12 @@
     <parent>
         <artifactId>aaa-authn-mdsal-store</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>aaa-authn-mdsal-api</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
index 0a7036543ff5c3abb284126772871801005e12d6..3af0b869bbc79027d0c1c398eb1f333b69e8483b 100644 (file)
@@ -3,10 +3,10 @@
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-authn-mdsal-store</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>aaa-authn-mdsal-config</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
 
     <description>AuthN Token Store Service Configuration file </description>
     <packaging>jar</packaging>
index 9634fd8325837d71c095b5410950440e2848b59c..dcaa9981156292a4152c54be141210c66c923250 100644 (file)
     <parent>
         <artifactId>aaa-authn-mdsal-store</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>aaa-authn-mdsal-store-impl</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-api</artifactId>
-            <version>0.2.0-Lithium</version>
+            <version>0.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn</artifactId>
-            <version>0.2.0-Lithium</version>
+            <version>0.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-mdsal-api</artifactId>
-            <version>0.2.0-Lithium</version>
+            <version>0.2.1-SNAPSHOT</version>
         </dependency>
 
         <!-- Test dependencies -->
index 65188929212a1de8bd24f9ce3a59816089d86cc5..1c8630d73dc77dc484b0c97e7f906440a1fb4978 100644 (file)
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>aaa.project</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>aaa-authn-mdsal-store</artifactId>
     <name>${project.artifactId}</name>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
index 14f6a08cfefcd837088dba8c164dcee6963132c7..3466b81d167e9a91620ab99aa060466265149009 100644 (file)
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-authn-odl-plugin</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
index adb6898f364603901cd50315385d75febc289c99..487073a97676ddc716aa22bf89b2d035fe6ab2a4 100644 (file)
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa.project</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>aaa-authn-sssd</artifactId>
-  <version>0.2.0-Lithium</version>
+  <version>0.2.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
index 66ffba973cea501e2074d4987f43181f8e8ab56c..93908a60e40ca02cee27e75aa8f9c2a97cf48e8c 100644 (file)
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-authn-store</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
index 0cdf3e2d7a79628b2bf4da37a1199bb4b7e44c99..b8535fd74b3365d6b3241e7ca8e995b5c83bcc42 100644 (file)
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-authn-sts</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
index 18b39e26b4f828ec9a5e6d35f38877b6f6ec0e39..48f85086a8fccd1f88637226c5919da10d060a27 100644 (file)
@@ -9,12 +9,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-authn</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
index 15febdb2e9c6b1689bc5b40ab0e9dc8ddfc02588..1888f7a26571014aee0bdc2ef6d42abc97b38b13 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aaa-authz</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
index 97f57870c03fc23cb44c97a4a9a4ff58604f501a..205bfc560344413001fc338763500d77a395a918 100644 (file)
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>aaa-authz</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
index abf537d76cf437534baf58c781efde3e1512bf6e..e35f1993685a16cf5fc995a20ad46241db5cd626 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aaa-authz</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
index eb16b13828b83ed2a534a246c51f734be19e6b57..518a699b38496b9b3d8a1335896e66e81db6771d 100644 (file)
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>aaa-authz</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
index 688c4ceb8a4a12fda1db54bffd013b414bed9cd3..76a1bdb20fe631e5bf52626ec2b035ad51578780 100644 (file)
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>aaa.project</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>aaa-authz</artifactId>
     <name>${project.artifactId}</name>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <modules>
index 0f99abad1252eb7c575d7a5958927ee9deb68be6..73a06786900074a12f2a8fc448a32ee5c8ff75f8 100644 (file)
@@ -10,18 +10,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.7.0-Lithium</version>
+    <version>0.7.1-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa-credential-store-api</artifactId>
-  <version>0.2.0-Lithium</version>
+  <version>0.2.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
-    <mdsal.version>1.2.0-Lithium</mdsal.version>
+    <mdsal.version>1.2.1-SNAPSHOT</mdsal.version>
   </properties>
 
   <dependencies>
index 190a8f19265c3a5daccc7618b49139c05994e905..e38a151d5b091b9a4e2139ca697854b6776f4ff2 100644 (file)
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa.project</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>aaa-idmlight</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
index e69efd09a308fe7b2b8e6ebc76e095abeee91dfa..c86374a080bb82a093aa27d275e7718f9e97b0bd 100644 (file)
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa.project</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>aaa-authn-idpmapping</artifactId>
-  <version>0.2.0-Lithium</version>
+  <version>0.2.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
index f134d6fee5a1158e43e68bf9523eeb16374a0d33..f496197a693ba3c5c790d03793d72cb461de0d45 100644 (file)
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.5.0-Lithium</version>
+        <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>commons.aaa</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.0.4</maven>
@@ -19,9 +19,9 @@
 
     <properties>
         <!-- Karaf -->
-        <karaf.branding.version>1.1.0-Lithium</karaf.branding.version>
-        <karaf.resources.version>1.5.0-Lithium</karaf.resources.version>
-        <karaf.empty.version>1.5.0-Lithium</karaf.empty.version>
+        <karaf.branding.version>1.1.1-SNAPSHOT</karaf.branding.version>
+        <karaf.resources.version>1.5.1-SNAPSHOT</karaf.resources.version>
+        <karaf.empty.version>1.5.1-SNAPSHOT</karaf.empty.version>
 
         <!-- Plugins -->
         <compiler.plugin.version>3.1</compiler.plugin.version>
         <osgi.metatype.version>1.0.10</osgi.metatype.version>
 
         <!-- AuthZ -->
-        <yangtools.version>0.7.0-Lithium</yangtools.version>
+        <yangtools.version>0.7.1-SNAPSHOT</yangtools.version>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <mdsal.version>1.2.0-Lithium</mdsal.version>
-        <restconf.version>1.2.0-Lithium</restconf.version>
-        <config.version>0.3.0-Lithium</config.version>
+        <mdsal.version>1.2.1-SNAPSHOT</mdsal.version>
+        <restconf.version>1.2.1-SNAPSHOT</restconf.version>
+        <config.version>0.3.1-SNAPSHOT</config.version>
         <config.authz.service.configfile>08-authz-config.xml</config.authz.service.configfile>
         <config.restconf.configfile>09-rest-connector.xml</config.restconf.configfile>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@ -55,7 +55,7 @@
         <config.authn.store.configfile>08-authn-config.xml</config.authn.store.configfile>
 
         <!-- Netconf plugin -->
-        <netconf.version>0.3.0-Lithium</netconf.version>
+        <netconf.version>0.3.1-SNAPSHOT</netconf.version>
 
         <!-- IdmLight -->
         <h2.version>1.4.185</h2.version>
@@ -67,7 +67,7 @@
         <!-- Test -->
         <javax.inject.version>1</javax.inject.version>
         <servlet.tester.version>7.0.0.M2</servlet.tester.version>
-        <features.test.version>1.5.0-Lithium</features.test.version>
+        <features.test.version>1.5.1-SNAPSHOT</features.test.version>
     </properties>
 
     <dependencyManagement>
index 9e93cdab4a664a98c08cd9b18151efba0a57424e..7d09208424b4664c9289e53e9792c81358c6ae90 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aaa.project</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>distribution-karaf</artifactId>
index 7d05b91601d8d90057ba1e7b2ca373395256b647..fa6fc4db9697c1810bcc1716cba826f2fdd64a37 100644 (file)
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>features-aggregator</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
index 2f68fa140c4bb2768789c86b909f3e0d50de0ec0..df516b67a72983d6cf741be254ec9fcd81595ae0 100644 (file)
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>features-aggregator</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
index dcf2f87d431a98569a5d89de14bae1f56bf69453..5754d4dcfb42587b3cd53fe620bb26304c3ddce1 100644 (file)
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>features-aggregator</artifactId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
         </dependency>
 
         <!-- test to validate features.xml -->
+        <!-- TEMPORARILY DISABLE TO BREAK CYCLIC DEPENDENCY
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-test</artifactId>
             <version>${features.test.version}</version>
             <scope>test</scope>
         </dependency>
+        -->
         <!-- dependency for opendaylight-karaf-empty for use by testing -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
index 1173b6c0f2fbde93563b921bd55dcbfa9c9433a0..12a72d39164763d4f31ba46dc8fca59e423f8705 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
         <artifactId>aaa.project</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
-        <version>0.2.0-Lithium</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
   </parent>
   <groupId>org.opendaylight.aaa</groupId>
diff --git a/pom.xml b/pom.xml
index 218b5fa513d6cd4c8b9bc97552614eae797ee8af..656ea405ab6d7346acddc6c758a91c0ade5da92e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>commons.aaa</artifactId>
-    <version>0.2.0-Lithium</version>
+    <version>0.2.1-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa.project</artifactId>
-  <version>0.2.0-Lithium</version>
+  <version>0.2.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>aaa</name> <!-- Used by Sonar to set project name -->
   <prerequisites>