Modifying yangtools versions to use 0.8.0

- This change is needed for the downstream SFC project,
  since this is causing SFC's version bump to fail

Change-Id: Ia7e392abd9d3053126b1bb5e3f8bfd15b031189f
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 8c559764a76d4acefbc216af5fffe51c101a3f5e..3cb364fbb4c5e51338fc2cdb45c2eea114f7090c 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -33,7 +33,7 @@
     <config.version>0.4.0-SNAPSHOT</config.version>
     <feature.test.version>0.8.0-SNAPSHOT</feature.test.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
+    <ietf-inet-types.version>2010.09.24.8-SNAPSHOT</ietf-inet-types.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
     <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
@@ -330,12 +330,12 @@
       <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>ietf-inet-types</artifactId>
-        <version>2010.09.24.7-SNAPSHOT</version>
+        <version>${ietf-inet-types.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>ietf-yang-types</artifactId>
-        <version>2010.09.24.7-SNAPSHOT</version>
+        <version>${ietf-inet-types.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.karaf.features</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 172b3becb9f2b8c717ba270569f6de72b523c94f..46d2e18906b260db48c459296f577c9593505c88 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -38,7 +38,7 @@
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${lispflowmapping.version}</bundle>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${lispflowmapping.version}</bundle>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/${lispflowmapping.version}</bundle>
-        <!-- <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.clusterdao/${lispflowmapping.version}</bundle> -->
+        <!-- <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.clusterdao/${lispflowmapping.version}</bundle>  -->
         <configfile finalname="${configfile.directory}/lfm-mappingservice.xml">
             mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${lispflowmapping.version}/xml/config
         </configfile>