From: Maros Marsalek <mmarsale@cisco.com>
Date: Fri, 19 Jun 2015 07:57:59 +0000 (+0200)
Subject: BUG 2458: Bump nagasena version to 2.53.0
X-Git-Tag: release/beryllium~449
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=dc3c64d64f55b8ae77459612cb8b0b22f599d25b

BUG 2458: Bump nagasena version to 2.53.0

Change-Id: I77e21237355cee3973a05a37981ab49a05018bf9
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 2c166e29fb..7200425e7e 100644
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -103,7 +103,7 @@
       <artifactId>sshd-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.openexi</groupId>
+      <groupId>openexi</groupId>
       <artifactId>nagasena</artifactId>
     </dependency>
     <dependency>
diff --git a/features/netconf/src/main/resources/features.xml b/features/netconf/src/main/resources/features.xml
index 4c3136f0a2..4301a5e83e 100644
--- a/features/netconf/src/main/resources/features.xml
+++ b/features/netconf/src/main/resources/features.xml
@@ -67,7 +67,7 @@
     <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
     <bundle>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
     <bundle>mvn:org.apache.sshd/sshd-core/${sshd-core.version}</bundle>
-    <bundle>mvn:org.openexi/nagasena/${exi.nagasena.version}</bundle>
+    <bundle>mvn:openexi/nagasena/${exi.nagasena.version}</bundle>
     <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
     <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
     <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index b7f2c07a4b..f6faaeab47 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -78,7 +78,7 @@
     <eclipse.jdt.core.compiler.batch.version>3.8.0.I20120518-2145</eclipse.jdt.core.compiler.batch.version>
 
     <!-- OpenEXI third party lib for netconf-->
-    <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
+    <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
     <felix.util.version>1.6.0</felix.util.version>
     <features.test.version>1.6.0-SNAPSHOT</features.test.version>
     <filtervalve.version>1.6.0-SNAPSHOT</filtervalve.version>
@@ -1216,12 +1216,12 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openexi</groupId>
+        <groupId>openexi</groupId>
         <artifactId>nagasena</artifactId>
         <version>${exi.nagasena.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.openexi</groupId>
+        <groupId>openexi</groupId>
         <artifactId>nagasena-rta</artifactId>
         <version>${exi.nagasena.version}</version>
       </dependency>
diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
index 29a1ab5733..622ce0f9a3 100644
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -88,11 +88,11 @@
 
     <!--TODO Create generic utilities(extract from this module) for integration tests on the controller-->
     <dependency>
-      <groupId>org.openexi</groupId>
+      <groupId>openexi</groupId>
       <artifactId>nagasena</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.openexi</groupId>
+      <groupId>openexi</groupId>
       <artifactId>nagasena-rta</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
index 1f163727f5..db7a1a69d6 100644
--- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@ -74,8 +74,8 @@ public class TestHelper {
                 mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "netconf-netty-util").versionAsInProject(), //
                 mavenBundle("org.apache.sshd", "sshd-core").versionAsInProject(), //
-                mavenBundle("org.openexi", "nagasena").versionAsInProject(), //
-                mavenBundle("org.openexi", "nagasena-rta").versionAsInProject(), //
+                mavenBundle("openexi", "nagasena").versionAsInProject(), //
+                mavenBundle("openexi", "nagasena-rta").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "netconf-mapping-api").versionAsInProject(), //
 
                 mavenBundle(CONTROLLER, "config-persister-impl").versionAsInProject(), //
diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java
index 5bba4deee8..10b40e3bed 100644
--- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java
+++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java
@@ -66,8 +66,8 @@ public abstract class AbstractIT {
                 mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), //
                 mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), //
                 mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(),
-                mavenBundle("org.openexi", "nagasena").versionAsInProject(),
-                mavenBundle("org.openexi", "nagasena-rta").versionAsInProject(),
+                mavenBundle("openexi", "nagasena").versionAsInProject(),
+                mavenBundle("openexi", "nagasena-rta").versionAsInProject(),
                  //
                 systemProperty("osgi.bundles.defaultStartLevel").value("4"),
                 systemPackages("sun.nio.ch"),
diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index 2de6e4c077..3aa1e4ca59 100644
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -36,11 +36,11 @@
       <artifactId>sample-toaster-provider</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.openexi</groupId>
+      <groupId>openexi</groupId>
       <artifactId>nagasena</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.openexi</groupId>
+      <groupId>openexi</groupId>
       <artifactId>nagasena-rta</artifactId>
     </dependency>
     <dependency>
diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
index 93b398f5b1..8cc4070ce8 100644
--- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
@@ -77,8 +77,8 @@ public class ToasterTest {
                 mavenBundle("org.opendaylight.controller.samples", "sample-toaster-provider").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller.samples", "sample-toaster-consumer").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller.samples", "sample-toaster").versionAsInProject(),
-                mavenBundle("org.openexi", "nagasena").versionAsInProject(),
-                mavenBundle("org.openexi", "nagasena-rta").versionAsInProject()
+                mavenBundle("openexi", "nagasena").versionAsInProject(),
+                mavenBundle("openexi", "nagasena-rta").versionAsInProject()
         );
     }
 
diff --git a/opendaylight/netconf/netconf-netty-util/pom.xml b/opendaylight/netconf/netconf-netty-util/pom.xml
index 90b39f4d45..c979a1aa04 100644
--- a/opendaylight/netconf/netconf-netty-util/pom.xml
+++ b/opendaylight/netconf/netconf-netty-util/pom.xml
@@ -53,11 +53,11 @@
       <artifactId>sshd-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.openexi</groupId>
+      <groupId>openexi</groupId>
       <artifactId>nagasena</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.openexi</groupId>
+      <groupId>openexi</groupId>
       <artifactId>nagasena-rta</artifactId>
     </dependency>
     <dependency>