Remove last instance of controller.version 85/6285/2
authorGiovanni Meo <gmeo@cisco.com>
Fri, 18 Apr 2014 15:48:21 +0000 (17:48 +0200)
committerAlessandro Boch <aboch@cisco.com>
Sat, 19 Apr 2014 19:51:34 +0000 (19:51 +0000)
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>
opendaylight/commons/opendaylight/pom.xml
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini

index 9b04c36..406da30 100644 (file)
@@ -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>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>logging.bridge</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
+        <version>${logging.bridge.version}</version>
       </dependency>
 
       <!-- Netconf -->
index e678ef7..9d0d6c1 100644 (file)
@@ -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
 

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.