Merge "Swap Collection.sort with List sort"

[so.git] / adapters / mso-adapter-utils / pom.xml

diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml
index 9593587..cd0a688 100644 (file)
--- a/adapters/mso-adapter-utils/pom.xml
+++ b/adapters/mso-adapter-utils/pom.xml
@@ -2,11 +2,11 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.onap.so</groupId>
                <artifactId>adapters</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.onap.so.adapters</groupId>
        <artifactId>mso-adapter-utils</artifactId>
        <name>mso-adapter-utils</name>
        <description>Common MSO utilities, including Openstack client wrappers.</description>
@@ -39,46 +39,49 @@
                                        </execution>
                                </executions>
                        </plugin>
-
-                       <plugin>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>2.3</version>
-                               <configuration>
-                                       <warSourceDirectory>WebContent</warSourceDirectory>
-                                       <failOnMissingWebXml>false</failOnMissingWebXml>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
 
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+<!--
+                       <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
+-->
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
                        <artifactId>keystone-client</artifactId>
-                       <version>1.1.0</version>
+                       <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+<!--
+                       <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
+-->
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
                        <artifactId>heat-client</artifactId>
-                       <version>1.1.0</version>
+                       <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+<!--
+                       <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
+-->
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
                        <artifactId>quantum-client</artifactId>
-                       <version>1.1.0</version>
+                       <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk.client-connectors</groupId>
+<!--
+                       <groupId>org.onap.so.libs.openstack-java-sdk.client-connectors</groupId>
+-->
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk.client-connectors</groupId>
                        <artifactId>http-connector</artifactId>
-                       <version>1.1.0</version>
+                       <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.onap.so</groupId>
                        <artifactId>common</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.onap.so</groupId>
                        <artifactId>mso-catalog-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
@@ -114,6 +117,18 @@
                        <version>1.10.19</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.jmockit</groupId>
+                       <artifactId>jmockit</artifactId>
+                       <version>1.8</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.12</version>
+                       <scope>test</scope>
+               </dependency>
 
                <dependency>
                        <groupId>org.jboss.spec.javax.ejb</groupId>
@@ -127,7 +142,7 @@
                        <version>2.2.0.Final</version>
                        <scope>provided</scope>
                </dependency>
-                               <dependency>
+               <dependency>
                        <groupId>org.yaml</groupId>
                        <artifactId>snakeyaml</artifactId>
                        <version>1.15</version>