From: Robert Varga <rovarga@cisco.com>
Date: Fri, 13 Feb 2015 19:28:55 +0000 (+0100)
Subject: Remove yang.prototypes.version
X-Git-Tag: release/lithium~53
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=openflowjava.git;a=commitdiff_plain;h=1781422877b0a2a208c3b0818b58c701f2db1098

Remove yang.prototypes.version

This corresponds to mdsal.version and is already covered by the import.

Change-Id: I77f2c225f2ae938380ed994d3726306ec9144390
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 72dda9a2..1ec8261f 100644
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -48,7 +48,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.generator.version}</version>
+                        <version>${yangtools.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
diff --git a/openflow-protocol-impl/pom.xml b/openflow-protocol-impl/pom.xml
index 3948f919..23d0e9fb 100644
--- a/openflow-protocol-impl/pom.xml
+++ b/openflow-protocol-impl/pom.xml
@@ -13,12 +13,6 @@
       <tag>HEAD</tag>
   </scm>
 
-    <properties>
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
-        <yangtools.binding.version>0.7.0-SNAPSHOT</yangtools.binding.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -79,7 +73,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.generator.version}</version>
+                        <version>${yangtools.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
@@ -115,7 +109,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${yang.prototype.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.opendaylight.controller</groupId>
diff --git a/openflow-protocol-spi/pom.xml b/openflow-protocol-spi/pom.xml
index 18369f5e..b2e13905 100644
--- a/openflow-protocol-spi/pom.xml
+++ b/openflow-protocol-spi/pom.xml
@@ -74,7 +74,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.generator.version}</version>
+                        <version>${yangtools.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
@@ -83,10 +83,9 @@
     </build>
 
     <dependencies>
-    	<dependency>
-    	    <groupId>${project.groupId}</groupId>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflow-protocol-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/pom.xml b/pom.xml
index 5d9fc1bb..1b20bbdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,11 +38,10 @@
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
         <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
-        <yang.prototype.version>1.2.0-SNAPSHOT</yang.prototype.version>
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
+
+        <config.version>0.3.0-SNAPSHOT</config.version>
         <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-	<config.version>0.3.0-SNAPSHOT</config.version>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
 
         <!-- Sonar config -->
         <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>