Merge "pom fix"

diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index 6b5304c..90f442a 100644 (file)
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -150,6 +150,7 @@
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
                
@@ -191,6 +192,7 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
                

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 20a6919..ee757ee 100644 (file)
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -21,6 +21,8 @@
                        <!--<scope>provided</scope>-->
                <!--</dependency>-->
 
+
+
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-context-support</artifactId>
@@ -243,12 +245,14 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
                <dependency>

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 8975ee1..05ac518 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -221,12 +221,14 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
                <!-- http client END -->

diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 4a6201b..96cb609 100644 (file)
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -24,6 +24,19 @@
 
 
        <dependencies>
+               <dependency>
+                       <groupId>commons-logging</groupId>
+                       <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>commons-codec</groupId>
+                       <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-core</artifactId>

diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 3783207..b3942b1 100644 (file)
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -16,6 +16,7 @@
 
 
        <dependencies>
+
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-core</artifactId>
@@ -226,12 +227,14 @@
                        <dependency>
                                <groupId>commons-logging</groupId>
                                <artifactId>commons-logging</artifactId>
+                               <version>1.2.1-SNAPSHOT</version>
                                <scope>compile</scope>
                        </dependency>
 
                        <dependency>
                                <groupId>commons-codec</groupId>
                                <artifactId>commons-codec</artifactId>
+                               <version>2.0-SNAPSHOT</version>
                                <scope>compile</scope>
                        </dependency>
                        <!-- http client END -->

diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index a65eebc..ed409a0 100644 (file)
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -16,6 +16,21 @@
        
 
        <dependencies>
+
+               <dependency>
+                       <groupId>commons-logging</groupId>
+                       <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>commons-codec</groupId>
+                       <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-core</artifactId>

diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 342c576..aacaa35 100644 (file)
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -161,12 +161,14 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
        

diff --git a/common-be/pom.xml b/common-be/pom.xml
index 13bd8c2..ce7b0d9 100644 (file)
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -24,6 +24,19 @@
 
 
        <dependencies>
+               <dependency>
+                       <groupId>commons-logging</groupId>
+                       <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>commons-codec</groupId>
+                       <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
                <!-- Common of SD&C -->
                <dependency>
                        <groupId>org.springframework</groupId>

diff --git a/pom.xml b/pom.xml
index e432f07..3b9a05b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -371,20 +371,6 @@
                                <scope>provided</scope>
                        </dependency>
 
-                       <dependency>
-                               <groupId>commons-logging</groupId>
-                               <artifactId>commons-logging</artifactId>
-                               <version>1.2.1-SNAPSHOT</version>
-                               <scope>provided</scope>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>commons-codec</groupId>
-                               <artifactId>commons-codec</artifactId>
-                               <version>2.0-SNAPSHOT</version>
-                               <scope>provided</scope>
-                       </dependency>
-
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>

diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index f5236e4..5c0726d 100644 (file)
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -14,6 +14,7 @@
        </parent>
 
        <dependencies>
+
                <dependency>
                        <groupId>org.seleniumhq.selenium</groupId>
                        <artifactId>selenium-java</artifactId>
@@ -77,6 +78,7 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
+                       <version>1.2.1-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
 
@@ -166,6 +168,7 @@
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
+                       <version>2.0-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
                

diff --git a/webseal-simulator/pom.xml b/webseal-simulator/pom.xml
index 5d18330..748e286 100644 (file)
--- a/webseal-simulator/pom.xml
+++ b/webseal-simulator/pom.xml
@@ -7,9 +7,9 @@
   <version>0.0.1-SNAPSHOT</version>
 
 <parent>
-<groupId>org.openecomp.sdc</groupId>
-<artifactId>sdc-main</artifactId>
-<version>1610.2.4</version>
+       <groupId>org.openecomp.sdc</groupId>
+       <artifactId>sdc-main</artifactId>
+       <version>1610.2.4</version>
 </parent>