Use ${project.version} instead of ovsdb.ui.version

This aligns ovsdb-ui with the rest of the project. The definition of
ovsdb.ui.version was removed in
I0a795d81e4422a5677981a1396ac36f90e103d35 but it was still referenced
in a couple of places.

Change-Id: Icd3a70c25aaf1af3429b5dfac488ad504de16fd2
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 962d28873fa9acc06006a0d2e8b857dec02334f0..f8949f542f45a26345dce7111e2fc7701eef39f4 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -45,7 +45,7 @@
     <configfile finalname="etc/opendaylight/karaf/netvirt-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}/xml/config</configfile>
     <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}/xml/config</configfile>
   </feature>
-  <feature name="odl-ovsdb-ui" description="OpenDaylight :: OVSDB :: DLUX Integration Plugin" version='${ovsdb.ui.version}'>
+  <feature name="odl-ovsdb-ui" description="OpenDaylight :: OVSDB :: DLUX Integration Plugin" version='${project.version}'>
     <feature version="${dlux.version}">odl-dlux-core</feature>
     <bundle>mvn:org.opendaylight.ovsdb/ovsdb-ui-bundle/{{VERSION}}</bundle>
   </feature>

diff --git a/ovsdb-ui/bundle/pom.xml b/ovsdb-ui/bundle/pom.xml
index 36c68b0193fdbe5c7f39d271412431edfcc16926..1c7ed0bae96be932d3bb01752cce26629dcd32a2 100644 (file)
--- a/ovsdb-ui/bundle/pom.xml
+++ b/ovsdb-ui/bundle/pom.xml
@@ -74,7 +74,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                    <artifactItem>
                       <groupId>org.opendaylight.ovsdb</groupId>
                       <artifactId>ovsdb-ui-module</artifactId>
-                      <version>${ovsdb.ui.version}</version>
+                      <version>${project.version}</version>
                       <overWrite>true</overWrite>
                       <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
                     </artifactItem>