Fixed most comments from https://git.opendaylight.org/gerrit/#/c/1721/

Change-Id: I174a3662b13a3a6f2f07954c2d0c742e98cc5ff2
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 60d42669430d1fab02c7a49a1fa7c4cf9db00c2d..9699b1a08f683ac4feddea5fbdddef9a961fc3d2 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -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>
@@ -497,6 +498,14 @@
         <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>

diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml
index 2111dd7b326c38a4c9b95af6be1ecf3276b64429..280d5ec188f4d011d712c92c7905c832a5bd8952 100644 (file)
--- a/opendaylight/md-sal/sal-common-api/pom.xml
+++ b/opendaylight/md-sal/sal-common-api/pom.xml
@@ -28,7 +28,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
-        
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/northbound/bundlescanner/implementation/pom.xml
index 3f795889ddb09262ca1fda6c54459f02eac00a00..baa0755dc9314f2ead370bad01acc804dc1d7a44 100644 (file)
--- a/opendaylight/northbound/bundlescanner/implementation/pom.xml
+++ b/opendaylight/northbound/bundlescanner/implementation/pom.xml
@@ -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>

diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/usermanager/api/pom.xml
index c301f8da2c4f0720548e65ac128d7409ef0c5528..78825e1ace343721f05a58c79acd111b4db955a3 100644 (file)
--- a/opendaylight/usermanager/api/pom.xml
+++ b/opendaylight/usermanager/api/pom.xml
@@ -98,33 +98,27 @@
     <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>

diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml
index 95941a307647506174b067b7ac68a7ce4df9babb..07f568b05c53740d23ce321f92317b1ed8f70fa1 100644 (file)
--- a/opendaylight/web/troubleshoot/pom.xml
+++ b/opendaylight/web/troubleshoot/pom.xml
@@ -124,7 +124,6 @@
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
   </dependencies>
 </project>