Bump to odlparent-3.1.0 oxygen SR2 snapshot

put dependencies modules into stable/oxygen SR2 x.y.(3-SNAPSHOT)

Change-Id: I4fbf2f792a673d53b22cd9da7ad5658833c992d4
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

diff --git a/api/pom.xml b/api/pom.xml
index 458670e74ba7f14a2bcea74a8a275d636ceca057..afd1a3c973a249388868bc81e518f1c498e873e4 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.12.2</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2bebe150d3bc528e88f8f7e27ecb2470a511dc27..f5b66878fcc6ead802ddf1a0d05896ddfdd90a1f 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 

diff --git a/cli/pom.xml b/cli/pom.xml
index 7bc4bf2bdfe03b96bc25b0ce37eb478e0f951ead..d339097098457db4e75f06804bd2ec3f56b35b5f 100644 (file)
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index 9935c53224aee77296343daa20c9166834f9c73d..28c782d10e74fc7da8652e37703f80d5ba560ed5 100644 (file)
--- a/features/features-transportpce/pom.xml
+++ b/features/features-transportpce/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 5c3fb7f47a14b523a44a7fccbc52ac9a53850657..fa43abc0502a5352af0a5f77a3183fe6b50d49d9 100644 (file)
--- a/features/odl-transportpce-api/pom.xml
+++ b/features/odl-transportpce-api/pom.xml
@@ -23,12 +23,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.model.version>0.12.2</mdsal.model.version>
-    <mdsal.version>1.7.2</mdsal.version>
-    <restconf.version>1.7.2</restconf.version>
-    <yangtools.version>2.0.5</yangtools.version>
-    <dlux.version>0.7.2</dlux.version>
-    <netconf.version>1.4.2</netconf.version>
+    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
+    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
+    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.7.3-SNAPSHOT</dlux.version>
+    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/odl-transportpce-cli/pom.xml b/features/odl-transportpce-cli/pom.xml
index 12cd1fbd92d14f01746885c8048e094593eb4c59..7191f3859803c9dd1f0474131bb73c2e0af36ed9 100644 (file)
--- a/features/odl-transportpce-cli/pom.xml
+++ b/features/odl-transportpce-cli/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -22,12 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <mdsal.model.version>0.12.2</mdsal.model.version>
-    <mdsal.version>1.7.2</mdsal.version>
-    <restconf.version>1.7.2</restconf.version>
-    <yangtools.version>2.0.5</yangtools.version>
-    <dlux.version>0.7.2</dlux.version>
-    <netconf.version>1.4.2</netconf.version>
+    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
+    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
+    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.7.3-SNAPSHOT</dlux.version>
+    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index f3cc25071ea3c5c7c10e200c11bc58c1d284450d..317acf7d5a51d4bac97a221f650cf32bbdc1ecc4 100644 (file)
--- a/features/odl-transportpce-ordmodels/pom.xml
+++ b/features/odl-transportpce-ordmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -22,12 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <mdsal.model.version>0.12.2</mdsal.model.version>
-    <mdsal.version>1.7.2</mdsal.version>
-    <restconf.version>1.7.2</restconf.version>
-    <yangtools.version>2.0.5</yangtools.version>
-    <dlux.version>0.7.2</dlux.version>
-    <netconf.version>1.4.2</netconf.version>
+    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
+    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
+    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.7.3-SNAPSHOT</dlux.version>
+    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/odl-transportpce-rest/pom.xml b/features/odl-transportpce-rest/pom.xml
index 864bd4a7582e329ed029d7a2d72833fa9375cda9..8d09163d62ff91af34c1b25ca202f72f4e48f92b 100644 (file)
--- a/features/odl-transportpce-rest/pom.xml
+++ b/features/odl-transportpce-rest/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <restconf.version>1.7.2</restconf.version>
+    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
   </properties>
 
   <name>OpenDaylight :: transportpce :: REST</name>

diff --git a/features/odl-transportpce-ui/pom.xml b/features/odl-transportpce-ui/pom.xml
index 09d149326b447ade01bdb76511e8de32c179f1bb..8c74d42a9fd6b502773b976450a363a3c1414455 100644 (file)
--- a/features/odl-transportpce-ui/pom.xml
+++ b/features/odl-transportpce-ui/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -22,8 +22,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <mdsal.version>1.7.2</mdsal.version>
-    <dlux.version>0.7.2</dlux.version>
+    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
+    <dlux.version>0.7.3-SNAPSHOT</dlux.version>
   </properties>
 
   <name>OpenDaylight :: transportpce :: UI</name>

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 21454f5c9c8f67fb905b84c1aa92f41ce2835ec9..0b0102be2827721be7d49dfc4a971c51893276d0 100644 (file)
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -23,11 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.model.version>0.12.2</mdsal.model.version>
-    <mdsal.version>1.7.2</mdsal.version>
-    <yangtools.version>2.0.5</yangtools.version>
-    <dlux.version>0.7.2</dlux.version>
-    <netconf.version>1.4.2</netconf.version>
+    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
+    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.7.3-SNAPSHOT</dlux.version>
+    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/pom.xml b/features/pom.xml
index 7b6a5f99de2f05f56215d5ad72ab1dcca3b8ac3d..8781d5ad9388ef5fcf8631bc6d2737a533fc4c68 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 

diff --git a/impl/pom.xml b/impl/pom.xml
index c42e4b313cd7b8cdac0983f287fc68f304291d2a..6d7e8dd324ecf4791d687b9e3fcac665fa1e2bd6 100644 (file)
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -31,12 +31,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-topology</artifactId>
-      <version>1.7.2</version>
+      <version>1.7.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>sal-netconf-connector</artifactId>
-      <version>1.7.2</version>
+      <version>1.7.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Testing Dependencies -->

diff --git a/it/pom.xml b/it/pom.xml
index fbf90e45885e84f62af8549548f6e45050f60469..c78c38f44c4ce413cadfcb7a5464c99746f971a7 100644 (file)
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>1.7.2</version>
+    <version>1.7.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 69516a2b40f69c4b0a8e0dec2be563e98f9a9ae0..bce1afdd9677b4ffded9fff90b556ee4ef495b38 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 

diff --git a/olm/pom.xml b/olm/pom.xml
index 38c0fc571e949dc972f6eafc06fa8a3e87f6c75b..4316baf92205cccbec1dc9d2843528b634370d7a 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -44,7 +44,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>sal-netconf-connector</artifactId>
-      <version>1.7.2</version>
+      <version>1.7.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Testing Dependencies -->

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 65a081ae31838f259931e5d228810a90171940bc..f110dcf12b54c8f64de90c1a7d424913d791d543 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.12.2</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -52,42 +52,42 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>ietf-netconf</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types-2013-07-15</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-afn-safi</artifactId>
-      <version>2013.07.04.12.2</version>
+      <version>2013.07.04.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-access-control-list</artifactId>
-      <version>0.10.2</version>
+      <version>0.10.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>2014.05.08.12.2</version>
+      <version>2014.05.08.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types-20130715</artifactId>
-      <version>2013.07.15.12.2</version>
+      <version>2013.07.15.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>2014.05.08.12.2</version>
+      <version>2014.05.08.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-packet-fields</artifactId>
-      <version>0.10.2</version>
+      <version>0.10.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 1a4c9926bccdb491e6498b4e16fff5af64ca5a0e..1fe836077ac44f7123be9e2cb131f58173ba22a4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -81,54 +81,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <!--
-          This profile is to ensure we only build javadocs reports
-          when we plan to deploy Maven site for our project.
-      -->
-      <id>maven-site</id>
-      <activation>
-        <file>
-          <exists>${user.dir}/deploy-site.xml</exists>
-        </file>
-      </activation>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>false</inherited>
-            <executions>
-              <execution>
-                <id>aggregate</id>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-                <phase>package</phase>
-            </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 262bfb7cdf24db8ba5d267a24d4d53e94e6d0211..6e5321ec25f3967aee4708331b4de93a0da46686 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -40,7 +40,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>sal-netconf-connector</artifactId>
-      <version>1.7.2</version>
+      <version>1.7.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Testing Dependencies -->

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index 50e2cfab326d837a77f888202986be72c23537d5..4ac732bf7910b716fa4dbe75e5376165e62d8387 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/pom.xml b/tests/pom.xml
index b21c7976e01ff72726684da30d6ccd495a7d861e..ad7ee1d910b678253b8cf8a5beb1c5b5a5544421 100644 (file)
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml
index ae0df320798a3f6345bcee9462a7f2759f286702..f67df06306a5d312e9f7c2db74ca05fdd7befebd 100644 (file)
--- a/tests/stubpce/pom.xml
+++ b/tests/stubpce/pom.xml
@@ -17,7 +17,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml
index 40be2eed5c9734121d6dbfa3e8c1a04ac0d3f3d5..5adece408ffaa419cb78374fb18e977743881614 100644 (file)
--- a/tests/stubrenderer/pom.xml
+++ b/tests/stubrenderer/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3-SNAPSHOT</version>
     <relativePath/>
   </parent>