Bump common dist after Magnesium SR1

Also update platform docs

Change-Id: I9f797ebb9e827fe787628d49f557ca8969200e83
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index 3cdeabe0fa4b08f14715402849f7676c88f6afa3..a772bb2b0a3fa731b10a9cb6ba9b48c1fbce055c 100644 (file)
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -10,41 +10,49 @@ Platform versions
    * - Group
      - Artifact
      - Magnesium GA
-     - Magnesium SR1 Development
+     - Magnesium SR1
+     - Magnesium SR2 Development
 
    * - org.opendaylight.odlparent
      - \*
      - 6.0.4
      - 6.0.6
+     - 6.0.6
 
    * - org.opendaylight.yangtools
      - yangtools-artifacts
      - 4.0.6
      - 4.0.8
+     - 4.0.8
 
    * - org.opendaylight.mdsal
      - binding-parent
      - 5.0.9
      - 5.0.10
+     - 5.0.10
 
    * - org.opendaylight.mdsal
      - mdsal-artifacts
      - 5.0.9
      - 5.0.10
+     - 5.0.10
 
    * - org.opendaylight.controller
      - mdsal-artifacts
      - 1.11.0
-     - 1.11.1-SNAPSHOT
+     - 1.11.1
+     - 1.11.2-SNAPSHOT
 
    * - org.opendaylight.aaa
      - aaa-artifacts
      - 0.11.0
-     - 0.11.1-SNAPSHOT
+     - 0.11.1
+     - 1.11.2-SNAPSHOT
 
    * - org.opendaylight.netconf
      - netconf-artifacts
      - 1.8.0
-     - 1.8.1-SNAPSHOT
+     - 1.8.1
+     - 1.8.2-SNAPSHOT
 
 .. note:: Most projects get their YANG Tools version via MD-SAL.

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index ac13d42e83539797467c889208c7aff365433d05..31ed5d22a34a5863d1343120e23a00bda34bbdd4 100644 (file)
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -14,12 +14,12 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>karaf</artifactId>
-        <version>0.12.1-SNAPSHOT</version>
+        <version>0.12.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>opendaylight</artifactId>
-    <version>0.12.1-SNAPSHOT</version>
+    <version>0.12.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: integration :: ${project.artifactId}</name>
     <description>The actual Karaf archive building sub-project.</description>
@@ -48,7 +48,7 @@
                 <dependency>
                     <groupId>org.opendaylight.detnet</groupId>
                     <artifactId>features-detnet</artifactId>
-                    <version>0.1.1-SNAPSHOT</version>
+                    <version>0.1.2-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
                     <scope>test</scope>
@@ -59,13 +59,13 @@
         <profile>
             <id>transportpce</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.opendaylight.transportpce</groupId>
                     <artifactId>odl-transportpce</artifactId>
-                    <version>1.1.0-SNAPSHOT</version>
+                    <version>1.2.0-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
                     <scope>test</scope>
@@ -73,7 +73,7 @@
                 <dependency>
                     <groupId>org.opendaylight.transportpce</groupId>
                     <artifactId>odl-transportpce-tapi</artifactId>
-                    <version>1.1.0-SNAPSHOT</version>
+                    <version>1.2.0-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
                     <scope>test</scope>
@@ -81,7 +81,7 @@
                 <dependency>
                     <groupId>org.opendaylight.transportpce</groupId>
                     <artifactId>odl-transportpce-inventory</artifactId>
-                    <version>1.1.0-SNAPSHOT</version>
+                    <version>1.2.0-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
                     <scope>test</scope>