update pom to remove spring from parent pom 99/1499/1
authorMichael Lando <ml636r@att.com>
Mon, 27 Feb 2017 21:48:43 +0000 (23:48 +0200)
committerMichael Lando <ml636r@att.com>
Mon, 27 Feb 2017 21:48:43 +0000 (23:48 +0200)
Change-Id: I100ee305833f4409ad8417efee1c2f7ef9a24750
Signed-off-by: Michael Lando <ml636r@att.com>
asdc-tests/pom.xml
asdctool/pom.xml
catalog-be/pom.xml
catalog-dao/pom.xml
catalog-fe/pom.xml
catalog-model/pom.xml
common-app-api/pom.xml
common-be/pom.xml
openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
pom.xml

index cc41ca9..6b5304c 100644 (file)
@@ -13,6 +13,7 @@
        
        
        <dependencies>
+
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
index 0166c88..20a6919 100644 (file)
 
 
        <dependencies>
+
+               <!--<dependency>-->
+                       <!--<groupId>org.springframework</groupId>-->
+                       <!--<artifactId>spring-beans</artifactId>-->
+                       <!--<version>${spring.version}</version>-->
+                       <!--<scope>provided</scope>-->
+               <!--</dependency>-->
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aspects</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
                <!-- ASDC dependencies -->
                <dependency>
                        <groupId>org.openecomp.sdc.be</groupId>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-expression</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
                <dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
                <!-- Spring 4 dependencies end -->
index a13c9bb..8975ee1 100644 (file)
 
 
        <dependencies>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aspects</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
                        <artifactId>security-utils</artifactId>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-webmvc</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-beans</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-expression</artifactId>
+                       <version>${spring.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-test</artifactId>
+                       <version>${spring.version}</version>
                        <scope>test</scope>
                </dependency>
 
index e5767ef..4a6201b 100644 (file)
 
 
        <dependencies>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-beans</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aspects</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-expression</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
                <!-- Common of SD&C -->
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
 
                <!-- SPRING -->
 
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context-support</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-beans</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjrt</artifactId>
                </dependency>
 
                <!-- TEST -->
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-test</artifactId>
-                       <scope>test</scope>
-               </dependency>
 
                <dependency>
                        <groupId>junit</groupId>
                        <scope>test</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-expression</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
                        <scope>test</scope>
                </dependency>
 
index b12c32b..3783207 100644 (file)
 
 
        <dependencies>
-               
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-beans</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aspects</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-expression</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+
                <dependency>
                        <groupId>org.functionaljava</groupId>
                        <artifactId>functionaljava</artifactId>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>spring-test</artifactId>
+                               <version>${spring.version}</version>
                                <scope>test</scope>
                        </dependency>
                </dependencies>
index 32116b2..a65eebc 100644 (file)
        
 
        <dependencies>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-beans</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aspects</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-expression</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
 
                <!-- Common of SD&C -->
                <dependency>
                </dependency>
                
                <!-- spring -->
-                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-beans</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <scope>provided</scope>
-               </dependency>
                
                 <dependency>
                <groupId>javax.validation</groupId>
                        <artifactId>mockito-all</artifactId>
                        <scope>test</scope>
                </dependency>
-               
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-test</artifactId>
-                       <scope>test</scope>
-               </dependency>
 
                <dependency>
                        <groupId>org.aspectj</groupId> 
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
                        <scope>test</scope>
                </dependency>
                
index 955e721..342c576 100644 (file)
        
        
        <dependencies>
-               <dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-beans</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aspects</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-expression</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+
+               <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>security-utils</artifactId>
             <version>${security-utils.version}</version>
index 9d27eb8..13bd8c2 100644 (file)
 
        <dependencies>
                <!-- Common of SD&C -->
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-beans</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aspects</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-expression</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
                        <artifactId>common-app-api</artifactId>
index 0dea1b3..f326d45 100644 (file)
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+                       <version>4.1.3.RELEASE</version>
         </dependency>
 
     </dependencies>
diff --git a/pom.xml b/pom.xml
index c4bba32..e432f07 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                                <scope>provided</scope>
                        </dependency>
 
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-core</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-beans</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-context-support</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-messaging</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-web</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-webmvc</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-aop</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-aspects</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-test</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>test</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework</groupId>
-                               <artifactId>spring-expression</artifactId>
-                               <version>${spring.version}</version>
-                               <scope>test</scope>
-                       </dependency>
-
                        <dependency>
                                <groupId>com.fasterxml.jackson.dataformat</groupId>
                                <artifactId>jackson-dataformat-yaml</artifactId>