Update to new version of the artifacts proposed by jenkins-controller-version-changes-16

Patch 2:  Added manual fixes not caught by mavne change versions plugin
Patch 3:  [chrisw] added two more manual fixes

Change-Id: I84e1e32de85ab817f1925a5a008088e3cfb91136
Signed-off-by: jenkins-controller <jenkins-controller@opendaylight.org>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>

diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index 1dc40f25bade45a19d31f8a1b7132946e1aaa773..70742bd550db0fccb8ed3203987650e224c6c5e0 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@ -9,8 +9,8 @@
   <properties>\r
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
   <properties>\r
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r

-    <yang.version>0.6.0-SNAPSHOT</yang.version>\r
-    <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>\r
+    <yang.version>0.6.1</yang.version>\r
+    <yang.codegen.version>0.6.1</yang.codegen.version>\r

     <bundle.plugin.version>2.3.7</bundle.plugin.version>\r
   </properties>\r
   <scm>\r
     <bundle.plugin.version>2.3.7</bundle.plugin.version>\r
   </properties>\r
   <scm>\r

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 00e4d4c6fb2c268504ee4d34fbe23349a0a44e2d..53d8e52c8b93bd27892e61c1187664f94e42ae2d 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -58,11 +58,11 @@
     <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
     <guava.version>14.0.1</guava.version>
     <osgi.core.version>5.0.0</osgi.core.version>
     <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
     <guava.version>14.0.1</guava.version>
     <osgi.core.version>5.0.0</osgi.core.version>

-    <ietf-inet-types.version>2010.09.24.2-SNAPSHOT</ietf-inet-types.version>
-    <ietf-yang-types.version>2010.09.24.2-SNAPSHOT</ietf-yang-types.version>
-    <ietf-topology.version>2013.10.21.0-SNAPSHOT</ietf-topology.version>
-    <opendaylight-l2-types.version>2013.08.27.2-SNAPSHOT</opendaylight-l2-types.version>
-    <yang-ext.version>2013.09.07.2-SNAPSHOT</yang-ext.version>
+    <ietf-inet-types.version>2010.09.24.3</ietf-inet-types.version>
+    <ietf-yang-types.version>2010.09.24.3</ietf-yang-types.version>
+    <ietf-topology.version>2013.10.21.1</ietf-topology.version>
+    <opendaylight-l2-types.version>2013.08.27.3</opendaylight-l2-types.version>
+    <yang-ext.version>2013.09.07.3</yang-ext.version>

     <javassist.version>3.17.1-GA</javassist.version>
     <releaseplugin.version>2.3.2</releaseplugin.version>
     <commons.lang.version>3.1</commons.lang.version>
     <javassist.version>3.17.1-GA</javassist.version>
     <releaseplugin.version>2.3.2</releaseplugin.version>
     <commons.lang.version>3.1</commons.lang.version>


@@ -70,7 +70,7 @@
     <enforcer.version>1.3.1</enforcer.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <junit.version>4.8.1</junit.version>
     <enforcer.version>1.3.1</enforcer.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <junit.version>4.8.1</junit.version>

-    <yangtools.version>0.6.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>0.6.1</yangtools.version>

     <!--versions for bits of the controller -->
     <controller.version>0.4.1-SNAPSHOT</controller.version>
     <hosttracker.api.version>0.5.1-SNAPSHOT</hosttracker.api.version>
     <!--versions for bits of the controller -->
     <controller.version>0.4.1-SNAPSHOT</controller.version>
     <hosttracker.api.version>0.5.1-SNAPSHOT</hosttracker.api.version>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 1de9c4856c8c4a682cef53e954893954417ddaed..9d9f507ba0e411b2d60c0da531e0996955d8383c 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -369,12 +369,12 @@
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-binding</artifactId>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-binding</artifactId>

-          <version>0.6.0-SNAPSHOT</version>
+          <version>0.6.1</version>

          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-type-provider</artifactId>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-type-provider</artifactId>

-          <version>0.6.0-SNAPSHOT</version>
+          <version>0.6.1</version>

          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
index 869a298d0fb18d7cd92acf8f8783104bf2544cfc..c1e2fecedd2ca3daf1e5dac2722ec7649442e3cd 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
+++ b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
@@ -72,7 +72,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.1</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/md-sal/model/model-flow-base/pom.xml b/opendaylight/md-sal/model/model-flow-base/pom.xml
index ffa3194418ef39f219e9cc87d99393c3c166eb38..f0cc7aca63e81aaac64493387db92c1fbc643c8b 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-base/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>

-            <version>2013.08.27.2-SNAPSHOT</version>
+            <version>2013.08.27.3</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/md-sal/model/model-flow-management/pom.xml b/opendaylight/md-sal/model/model-flow-management/pom.xml
index fe7b9f29f96002a891824f9be0df42d09bf482dc..94ca96e42ce11758fd23b972f7f9ad22f28562a8 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-management/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>

-            <version>2013.08.27.2-SNAPSHOT</version>
+            <version>2013.08.27.3</version>

         </dependency>
     </dependencies>
     <packaging>bundle</packaging>
         </dependency>
     </dependencies>
     <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/model/model-flow-service/pom.xml b/opendaylight/md-sal/model/model-flow-service/pom.xml
index fac7cfae284d660a6077ffc969ee230e9acb0ec9..e512e254027df3b2486de151e1cfaec7955db520 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-service/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>

-            <version>2013.08.27.2-SNAPSHOT</version>
+            <version>2013.08.27.3</version>

         </dependency>
     </dependencies>
     <packaging>bundle</packaging>
         </dependency>
     </dependencies>
     <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/model/model-flow-statistics/pom.xml b/opendaylight/md-sal/model/model-flow-statistics/pom.xml
index e357f7d76f1c4c9774b31a50f14cf3f6e2ff3631..be2d7ee662b9b7d54c9e230b2b447390cea91709 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-statistics/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>

-            <version>2013.08.27.2-SNAPSHOT</version>
+            <version>2013.08.27.3</version>

         </dependency>
     </dependencies>
     <packaging>bundle</packaging>
         </dependency>
     </dependencies>
     <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 50304ff41af03eb06bb1e48c14f50de06222cf09..90ba8fb55280d1c2f554ea3090f2d03b7bb141b5 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -102,7 +102,7 @@
     </profiles>
 
     <properties>
     </profiles>
 
     <properties>

-        <yangtools.version>0.6.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>0.6.1</yangtools.version>

         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <!-- Java Versions -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <!-- Java Versions -->

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 68358b35161cb7d1a9ec98325ec490023c77c47e..b993bcc5f5ff0bfa199e3420e4477eda11bca47c 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -56,7 +56,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.1</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>


@@ -253,12 +253,12 @@
             <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
             <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>

-            <version>2010.09.24.2-SNAPSHOT</version>
+            <version>2010.09.24.3</version>

         </dependency>
         <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>ietf-topology-l3-unicast-igp</artifactId>
         </dependency>
         <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>ietf-topology-l3-unicast-igp</artifactId>

-        <version>2013.10.21.0-SNAPSHOT</version>
+        <version>2013.10.21.1</version>

         <scope>test</scope>
         </dependency>
         <dependency>
         <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
index 852314f4d4d93905912cb844a810a6b85bd0a622..593ea1faf5704c305d7aaef9be1c4025febb3f7d 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -69,7 +69,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.1</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml
index 2557026ffb0f40ca3b637a4454efc07128d41b18..454b399d63ad38e41312d3d213c70189ce8cd853 100644 (file)
--- a/opendaylight/md-sal/sal-common-api/pom.xml
+++ b/opendaylight/md-sal/sal-common-api/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

-            <version>0.6.0-SNAPSHOT</version>
+            <version>0.6.1</version>

         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml
index c65a2f51e51f55c7af6121f55388ea28f11eab55..3cb468f7d849905ef677f332350f1c667c66c9a8 100644 (file)
--- a/opendaylight/md-sal/sal-common-util/pom.xml
+++ b/opendaylight/md-sal/sal-common-util/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>concepts</artifactId>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>concepts</artifactId>

-      <version>0.6.0-SNAPSHOT</version>
+      <version>0.6.1</version>

     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index ac273cd885c0277ffda838ef312b6ee3eee9c304..6d76de2c47c9d3f6b35eba6b751df96210d026c2 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -59,7 +59,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.1</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 57ad058c4ec4e859d347579f8fa6b287ce1f7762..284b4a7bb2829d8d196d6663b8a2e64c6d874ab9 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -104,7 +104,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.1</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml
index 89f576ccc9d2805cbb31b737633400b297e0b781..a413b710b1128d35f1ac75f09d7f6b07575c68b9 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/pom.xml
+++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>

-            <version>2010.09.24.2-SNAPSHOT</version>
+            <version>2010.09.24.3</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>


@@ -247,7 +247,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.1</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
index cb2f5482d6ad3ea683ddf38a6e39c5db385d4c1b..619b42be054d1637f00877b54525719e244a416b 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@ -189,7 +189,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.1</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
index 96eda6eb3708d13c119bb0c057f6ea72c6b59163..8813ee9613448a49e66370e2d163d0e13115189a 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
@@ -329,12 +329,12 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>yang-ext</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>yang-ext</artifactId>

-            <version>2013.09.07.2-SNAPSHOT</version>
+            <version>2013.09.07.3</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>

-            <version>2013.08.27.2-SNAPSHOT</version>
+            <version>2013.08.27.3</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>