Fixed most comments from https://git.opendaylight.org/gerrit/#/c/1721/ 56/1756/2
authorEd Warnicke <eaw@cisco.com>
Tue, 8 Oct 2013 22:34:55 +0000 (17:34 -0500)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 8 Oct 2013 22:36:01 +0000 (22:36 +0000)
Change-Id: I174a3662b13a3a6f2f07954c2d0c742e98cc5ff2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
opendaylight/commons/opendaylight/pom.xml
opendaylight/md-sal/sal-common-api/pom.xml
opendaylight/northbound/bundlescanner/implementation/pom.xml
opendaylight/usermanager/api/pom.xml
opendaylight/web/troubleshoot/pom.xml

index 60d4266..9699b1a 100644 (file)
@@ -48,6 +48,7 @@
     <jackson.version>1.9.8</jackson.version>
     <spring.version>3.1.3.RELEASE</spring.version>
     <spring-security.version>3.1.3.RELEASE</spring-security.version>
+    <spring-osgi.version>1.2.1</spring-osgi.version>
     <jersey.version>1.17</jersey.version>
     <virgo.version>3.6.0.RELEASE</virgo.version>
     <geminiweb.version>2.2.0.RELEASE</geminiweb.version>
         <artifactId>org.springframework.web.servlet</artifactId>
         <version>${spring.version}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.springframework.osgi</groupId>
+        <artifactId>spring-osgi-mock</artifactId>
+        <version>${spring-osgi.version}</version>
+        <scope>test</scope>
+      </dependency>
+
       <!-- Spring security -->
       <dependency>
         <groupId>org.springframework.security</groupId>
index 2111dd7..280d5ec 100644 (file)
@@ -28,7 +28,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
-        
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
index 3f79588..baa0755 100644 (file)
@@ -62,7 +62,6 @@
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-mock</artifactId>
-      <version>1.2.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
index c301f8d..78825e1 100644 (file)
     <dependency>
       <groupId>equinoxSDK381</groupId>
       <artifactId>javax.servlet</artifactId>
-      <version>3.0.0.v201112011016</version>
     </dependency>
     <!-- Spring security -->
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>${spring-security.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>${spring-security.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
-      <version>${spring-security.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-taglibs</artifactId>
-      <version>${spring-security.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>org.springframework.transaction</artifactId>
-      <version>${spring-security.version}</version>
     </dependency>
   </dependencies>
 </project>
index 95941a3..07f568b 100644 (file)
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
   </dependencies>
 </project>