summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-09-13 17:26:31 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-13 17:26:31 +0000
commit8b14f495beba5b281ea167202f3038f9e44cb5ff (patch)
tree0c2176d399e2969e73a3dcef18d3507b63b4c5ea
parent45e38d57442499a535f2915aab95a057e106d79f (diff)
parent39987c8b276fb8d56cf3f2bcf957953b32e4abc7 (diff)
Merge "Replaced all the dependencies of"
-rw-r--r--asdc-tests/pom.xml4
-rw-r--r--asdctool/pom.xml4
-rw-r--r--catalog-be/pom.xml5
-rw-r--r--catalog-dao/pom.xml5
-rw-r--r--catalog-model/pom.xml4
-rw-r--r--sdc-os-chef/pom.xml11
-rw-r--r--test-apis-ci/pom.xml4
-rw-r--r--ui-ci/pom.xml4
8 files changed, 19 insertions, 22 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index de800cfcf7..266ad36903 100644
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -226,8 +226,8 @@
</dependency>
<dependency>
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-cassandra</artifactId>
+ <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+ <artifactId>sdc-titan-cassandra</artifactId>
<version>${titan.version}</version>
<scope>compile</scope>
<exclusions>
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 633360d8f8..410e852f8f 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -269,8 +269,8 @@
</dependency>
<dependency>
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-cassandra</artifactId>
+ <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+ <artifactId>sdc-titan-cassandra</artifactId>
<version>${titan.version}</version>
<scope>compile</scope>
<exclusions>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 6d34402ac5..8b638e84d7 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -320,9 +320,8 @@
</dependency>
<dependency>
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-cassandra</artifactId>
- <!--<artifactId>asdc-titan-cassandra</artifactId>-->
+ <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+ <artifactId>sdc-titan-cassandra</artifactId>
<version>${titan.version}</version>
<scope>compile</scope>
<exclusions>
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 2627899e1f..d3c255ae79 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -221,9 +221,8 @@
</dependency>
<dependency>
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-cassandra</artifactId>
- <!--<artifactId>asdc-titan-cassandra</artifactId>-->
+ <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+ <artifactId>sdc-titan-cassandra</artifactId>
<version>${titan.version}</version>
<scope>provided</scope>
<exclusions>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 444686d3a2..3752d79a20 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -119,8 +119,8 @@
</dependency>
<dependency>
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-cassandra</artifactId>
+ <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+ <artifactId>sdc-titan-cassandra</artifactId>
<version>${titan.version}</version>
<scope>provided</scope>
<exclusions>
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 79eab3502a..654284741c 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -186,10 +186,10 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.19.1</version>
+ <version>0.22.1</version>
<configuration>
- <verbose>true</verbose>
+ <verbose>false</verbose>
<apiVersion>1.23</apiVersion>
<images>
@@ -291,11 +291,10 @@
<id>clean-images</id>
<phase>pre-clean</phase>
<goals>
- <goal>remove</goal>
+ <goal>remove</goal>
</goals>
<configuration>
- <removeAll>true</removeAll>
- <image>openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana<!-- ,openecomp/sdc-sanity --></image>
+ <removeAll>true</removeAll>
</configuration>
</execution>
@@ -315,7 +314,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana<!-- ,openecomp/sdc-sanity --></image>
+ <image>openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-cassandra<!--,openecomp/sdc-sanity--></image>
</configuration>
</execution>
</executions>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 7184c8b06f..a86358a2d1 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -226,8 +226,8 @@
</dependency>
<dependency>
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-cassandra</artifactId>
+ <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+ <artifactId>sdc-titan-cassandra</artifactId>
<version>${titan.version}</version>
<scope>compile</scope>
<exclusions>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 9206348c3b..03b3f155bb 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -135,8 +135,8 @@
</dependency>
<dependency>
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-cassandra</artifactId>
+ <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+ <artifactId>sdc-titan-cassandra</artifactId>
<version>${titan.version}</version>
<scope>compile</scope>
</dependency>