Bug 1186 - of-flow: pop-mpls-action different in config and operational data store

[openflowplugin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 67bb272e84ffce74a3a4e40919434d80468eb99d..d708998de2698da7bce6e5b4660d9e9c46538df2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,12 +20,12 @@
       <!-- OpenDayLight Released artifact -->
       <repository>
         <id>opendaylight-release</id>
-        <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        <url>${nexusproxy}/repositories/opendaylight.release</url>
       </repository>
       <!-- OpenDayLight Snapshot artifact -->
       <snapshotRepository>
         <id>opendaylight-snapshot</id>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
       </snapshotRepository>
       <!-- Site deployment -->
       <!-- site>
@@ -38,6 +38,8 @@
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
       <slf4j.version>1.7.2</slf4j.version>
       <logback.version>1.0.9</logback.version>
+      <karaf.version>3.0.1</karaf.version>
+      <mdsal.version>1.1-SNAPSHOT</mdsal.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
       <openflowjava.version>0.5-SNAPSHOT</openflowjava.version>
       <controller.model.version>1.1-SNAPSHOT</controller.model.version>
@@ -52,7 +54,7 @@
       <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
       <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
       <maven.bundle.version>2.4.0</maven.bundle.version>
-      <exi.nagasena.version>0000.0002.0038.0-SNAPSHOT</exi.nagasena.version>
+      <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
     </properties>
 
     <dependencyManagement>
@@ -224,12 +226,12 @@
 
         <!-- thirdparty -->
         <dependency>
-          <groupId>org.opendaylight.controller.thirdparty</groupId>
+          <groupId>org.openexi</groupId>
           <artifactId>nagasena</artifactId>
           <version>${exi.nagasena.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller.thirdparty</groupId>
+          <groupId>org.openexi</groupId>
           <artifactId>nagasena-rta</artifactId>
           <version>${exi.nagasena.version}</version>
         </dependency>
@@ -462,18 +464,10 @@
     </profiles>
 
     <repositories>
-      <repository>
-        <id>opendaylight-release</id>
-        <name>opendaylight-release</name>
-        <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </repository>
       <repository>
         <id>opendaylight-snapshot</id>
         <name>opendaylight-snapshot</name>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
         <releases>
           <enabled>false</enabled>
         </releases>
@@ -481,7 +475,7 @@
       <repository>
         <id>public</id>
         <name>public</name>
-        <url>${nexusproxy}/groups/public/</url>
+        <url>${nexusproxy}/groups/public</url>
         <snapshots>
           <enabled>false</enabled>
         </snapshots>
@@ -493,7 +487,7 @@
       <pluginRepository>
         <id>opendaylight-central</id>
         <name>opendaylight-central</name>
-        <url>${nexusproxy}/repositories/public/</url>
+        <url>${nexusproxy}/repositories/public</url>
         <snapshots>
           <enabled>false</enabled>
         </snapshots>
@@ -501,7 +495,7 @@
       <pluginRepository>
         <id>opendaylight-snapshot</id>
         <name>central2</name>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
         <releases>
           <enabled>false</enabled>
         </releases>
@@ -515,6 +509,7 @@
       <module>openflowplugin-it</module>
       <module>test-provider</module>
       <module>drop-test</module>
+      <module>features</module>
       <module>samples/sample-consumer</module>
       <module>samples/learning-switch</module>
     </modules>