aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-02-28 00:14:37 +0000
committerGerrit Code Review <gerrit@openecomp.org>2017-02-28 00:14:37 +0000
commitfdf4f9e898f7597c3b5d5f6b7eaf54520d04aad2 (patch)
tree023061e6968774f6931a5cd431237deb06a45e91
parent3db1568ddb6a1d8801de38f0aeeab70b81e8df24 (diff)
parent2e0ef97f37a2fb4174d48fc86adbc3b73b1a957b (diff)
Merge "pom fix"
-rw-r--r--asdc-tests/pom.xml2
-rw-r--r--asdctool/pom.xml4
-rw-r--r--catalog-be/pom.xml2
-rw-r--r--catalog-dao/pom.xml13
-rw-r--r--catalog-fe/pom.xml3
-rw-r--r--catalog-model/pom.xml15
-rw-r--r--common-app-api/pom.xml2
-rw-r--r--common-be/pom.xml13
-rw-r--r--pom.xml14
-rw-r--r--ui-ci/pom.xml3
-rw-r--r--webseal-simulator/pom.xml6
11 files changed, 60 insertions, 17 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index 6b5304c350..90f442a892 100644
--- 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 20a6919468..ee757ee79f 100644
--- 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 8975ee1157..05ac518397 100644
--- 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 4a6201b1ad..96cb609763 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -25,6 +25,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>
<version>${spring.version}</version>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 3783207fb9..b3942b179b 100644
--- 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 a65eebc817..ed409a0bd5 100644
--- 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 342c5763fa..aacaa35ef8 100644
--- 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 13bd8c2235..ce7b0d944e 100644
--- 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 e432f07004..3b9a05bd0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,20 +372,6 @@
</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>
<version>4.12</version>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index f5236e40fa..5c0726d399 100644
--- 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 5d183303f0..748e286c03 100644
--- 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>