Merge remote branch 'origin/release-1.0.X' into mer

[lispflowmapping.git] / mappingservice / northbound / pom.xml

diff --git a/mappingservice/northbound/pom.xml b/mappingservice/northbound/pom.xml
index 3ddf233bef907e21e51a28976f9784d82e8ccf16..c1e37a0040cfcae10ae1c7440f33de78bdc2126e 100644 (file)
--- a/mappingservice/northbound/pom.xml
+++ b/mappingservice/northbound/pom.xml
@@ -22,7 +22,7 @@
                        <plugin>
                                <groupId>org.codehaus.enunciate</groupId>
                                <artifactId>maven-enunciate-plugin</artifactId>
-                               <version>1.27</version>
+                               <version>${enunciate.version}</version>
                                <!-- <dependencies> <dependency> <groupId>org.opendaylight.controller</groupId> 
                                        <artifactId>sal</artifactId> <version>0.5.0-SNAPSHOT</version> </dependency> 
                                        <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>clustering.services</artifactId> 
@@ -108,13 +108,11 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
 
                <dependency>
@@ -141,7 +139,7 @@
                <dependency>
                        <groupId>org.codehaus.enunciate</groupId>
                        <artifactId>enunciate-core-annotations</artifactId>
-                       <version>1.27</version>
+                       <version>${enunciate.version}</version>
                </dependency>
 
        </dependencies>