From: Giovanni Meo <gmeo@cisco.com>
Date: Fri, 18 Apr 2014 15:48:21 +0000 (+0200)
Subject: Remove last instance of controller.version
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~193
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=f2a95080b262418d109d7f1151cf3d9d3aae6237;hp=2b964df8313ad4f30da8b0fec828140281bf68e9

Remove last instance of controller.version

controller.version was still used in the config.ini so made sure to
fix it

Change-Id: I7739df2c16dae6ce0e2f26aa991ff0984963cc63
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
---

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 9b04c36359..406da302aa 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -65,6 +65,7 @@
     <jolokia.version>1.1.4</jolokia.version>
     <junit.version>4.8.1</junit.version>
     <logback.version>1.0.9</logback.version>
+    <logging.bridge.version>0.4.2-SNAPSHOT</logging.bridge.version>
     <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
     <!-- Java Versions -->
     <maven.compiler.source>1.7</maven.compiler.source>
@@ -809,7 +810,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>logging.bridge</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
+        <version>${logging.bridge.version}</version>
       </dependency>
 
       <!-- Netconf -->
diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index e678ef726d..9d0d6c1888 100644
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@ -8,7 +8,7 @@ osgi.bundles=\
     reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\
     reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\
     reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\
-    reference\:file\:../lib/logging.bridge-${controller.version}@1:start,\
+    reference\:file\:../lib/logging.bridge-${logging.bridge.version}@1:start,\
     reference\:file\:../lib/jersey-core-1.17.jar@2:start,\
     reference\:file\:../lib/jersey-server-1.17.jar@2:start