From: Robert Varga <rovarga@cisco.com>
Date: Mon, 30 Mar 2015 10:04:53 +0000 (+0200)
Subject: Unify property definitions
X-Git-Tag: release/lithium~586
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F17332%2F5;p=openflowplugin.git

Unify property definitions

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

diff --git a/extension/features/pom.xml b/extension/features/pom.xml
index aab9f632e7..f941532adc 100644
--- a/extension/features/pom.xml
+++ b/extension/features/pom.xml
@@ -14,7 +14,6 @@
   <properties>
     <features.file>features.xml</features.file>
     <karaf.empty.distro.version>1.5.0-SNAPSHOT</karaf.empty.distro.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
   </properties>
 
   <dependencies>
diff --git a/extension/pom.xml b/extension/pom.xml
index 71c8f66a0c..a7efcf4097 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -10,11 +10,6 @@
         <relativePath>../</relativePath>
     </parent>
 
-    <properties>
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-        <ofjava.version>0.6.0-SNAPSHOT</ofjava.version>
-    </properties>
-
     <artifactId>openflowplugin-extension-parent</artifactId>
     <packaging>pom</packaging>
     <modules>
diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index dc8f35ced0..df70bb6f8b 100644
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -10,10 +10,6 @@
   </parent>
   <artifactId>test-extension</artifactId>
   
-  <properties>
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    </properties>
-  
   <packaging>bundle</packaging>
     
     <build>
diff --git a/features/pom.xml b/features/pom.xml
index 4721d60586..28b0cb4fc4 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,7 +14,6 @@
   <properties>
     <features.file>features.xml</features.file>
     <karaf.empty.distro.version>1.5.0-SNAPSHOT</karaf.empty.distro.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
   </properties>
diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 841dd6ee71..4d3f1c38a2 100644
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -11,14 +11,6 @@
     <artifactId>openflowplugin-impl</artifactId>
     <packaging>bundle</packaging>
 
-    <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>
-        <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
-        <sal-binding-api.version>1.2.0-SNAPSHOT</sal-binding-api.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -117,7 +109,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${sal-binding-api.version}</version>
         </dependency>
 
         <dependency>
diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 43b9782fe4..48eba20ddb 100644
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -11,14 +11,6 @@
     <artifactId>openflowplugin</artifactId>
     <packaging>bundle</packaging>
 
-    <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>
-        <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
-        <sal-binding-api.version>1.2.0-SNAPSHOT</sal-binding-api.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -111,7 +103,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${sal-binding-api.version}</version>
+            <version>${sal.binding.api.version}</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 3dd522014c..4658608658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,44 +83,19 @@
 
     <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
-        </dependency>
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-common</artifactId>
-          <version>${yang.binding.version}</version>
+          <artifactId>yangtools-artifacts</artifactId>
+          <version>${yangtools.version}</version>
           <scope>import</scope>
           <type>pom</type>
         </dependency>
+
         <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>ietf-inet-types</artifactId>
-          <version>${ietf-inet-types.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>ietf-yang-types</artifactId>
-          <version>${ietf-yang-types.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>yang-ext</artifactId>
-            <version>${yang-ext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>opendaylight-l2-types</artifactId>
-            <version>${opendaylight-l2-types.version}</version>
+          <groupId>org.opendaylight.openflowplugin</groupId>
+          <artifactId>openflowplugin-api</artifactId>
+          <version>${project.version}</version>
         </dependency>
-
-          <dependency>
-              <groupId>org.opendaylight.openflowplugin</groupId>
-              <artifactId>openflowplugin-api</artifactId>
-              <version>${project.version}</version>
-          </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
           <artifactId>openflow-protocol-api</artifactId>
@@ -238,11 +213,6 @@
           <artifactId>config-api</artifactId>
           <version>${config.parent.version}</version>
         </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-          <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-          <version>4.0</version>
-        </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>logback-config</artifactId>