Merge "Remove unneeded param type definition"

[so.git] / bpmn / MSOInfrastructureBPMN / pom.xml

diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml
index 36de61b..79d3c4f 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/pom.xml
+++ b/bpmn/MSOInfrastructureBPMN/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>org.openecomp.so</groupId>\r
+               <groupId>org.onap.so</groupId>\r
                <artifactId>bpmn</artifactId>\r
-               <version>1.1.1-SNAPSHOT</version>\r
+               <version>1.2.0-SNAPSHOT</version>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>MSOInfrastructureBPMN</artifactId>\r
@@ -200,7 +200,11 @@
                        <groupId>org.camunda.bpm</groupId>\r
                        <artifactId>camunda-engine-cdi</artifactId>\r
                </dependency>\r
-\r
+               <dependency>\r
+                   <groupId>com.google.guava</groupId>\r
+                   <artifactId>guava</artifactId>\r
+                   <version>22.0</version> <!-- or 22.0-android for the Android flavor -->\r
+               </dependency>\r
                <dependency>\r
                        <!-- AssertJ Testing Library -->\r
                        <groupId>org.camunda.bpm.extension</groupId>\r
@@ -208,14 +212,7 @@
                        <version>1.2</version>\r
                        <scope>test</scope>\r
                </dependency>\r
-               <dependency>\r
-                       <groupId>org.mockito</groupId>\r
-                       <artifactId>mockito-all</artifactId>\r
-                       <version>1.10.19</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
                \r
-\r
                <!-- Spin dataformat support, in compile scope to include it in the war\r
                        file -->\r
                <dependency>\r
@@ -246,20 +243,6 @@
                        <artifactId>bootstrap</artifactId>\r
                        <version>2.3.2</version>\r
                </dependency>\r
-\r
-               <dependency>\r
-                   <groupId>org.jboss.resteasy</groupId>\r
-                   <artifactId>resteasy-client</artifactId>\r
-                   <version>3.0.19.Final</version>\r
-                   <scope>provided</scope>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>org.apache.httpcomponents</groupId>\r
-                                       <artifactId>httpclient</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-\r
                <dependency>\r
                        <!-- Needed for InMemoryH2Test -->\r
                        <groupId>com.h2database</groupId>\r
@@ -281,17 +264,17 @@
                        <version>3.4</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.so</groupId>\r
+                       <groupId>org.onap.so</groupId>\r
                        <artifactId>MSOCoreBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.so</groupId>\r
+                       <groupId>org.onap.so</groupId>\r
                        <artifactId>MSOCommonBPMN</artifactId>\r
                        <version>${project.version}</version>\r
-               </dependency>\r
+           </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.so</groupId>\r
+                       <groupId>org.onap.so</groupId>\r
                        <artifactId>MSOCommonBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                        <classifier>tests</classifier>\r
@@ -299,7 +282,7 @@
                </dependency>\r
                <dependency>\r
                        <!-- unit test utilities -->\r
-                       <groupId>org.openecomp.so</groupId>\r
+                       <groupId>org.onap.so</groupId>\r
                        <artifactId>MSOCoreBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                        <classifier>tests</classifier>\r
@@ -317,7 +300,7 @@
        <version>4.3.2.RELEASE</version>\r
        </dependency>\r
        <dependency>\r
-         <groupId>org.openecomp.so</groupId>\r
+         <groupId>org.onap.so</groupId>\r
          <artifactId>MSORESTClient</artifactId>\r
          <version>${project.version}</version>\r
        </dependency>\r
@@ -329,55 +312,7 @@
         <scope>provided</scope>\r
     </dependency>\r
 \r
-       <dependency>\r
-                       <groupId>com.github.tomakehurst</groupId>\r
-                       <artifactId>wiremock</artifactId>\r
-                       <version>1.56</version>\r
-                       <scope>test</scope>\r
-                       <classifier>standalone</classifier>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>org.mortbay.jetty</groupId>\r
-                                       <artifactId>jetty</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>com.google.guava</groupId>\r
-                                       <artifactId>guava</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-core</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-annotations</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-databind</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>org.apache.httpcomponents</groupId>\r
-                                       <artifactId>httpclient</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>org.skyscreamer</groupId>\r
-                                       <artifactId>jsonassert</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>xmlunit</groupId>\r
-                                       <artifactId>xmlunit</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>com.jayway.jsonpath</groupId>\r
-                                       <artifactId>json-path</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>net.sf.jopt-simple</groupId>\r
-                                       <artifactId>jopt-simple</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
+\r
                <dependency>\r
                <groupId>org.camunda.bpm</groupId>\r
                <artifactId>camunda-engine-spring</artifactId>\r
@@ -394,17 +329,6 @@
                        <version>1.0.0-alpha8</version>\r
                        <scope>test</scope>\r
                </dependency>\r
-               <dependency>\r
-       <groupId>org.jboss.resteasy</groupId>\r
-       <artifactId>resteasy-jackson2-provider</artifactId>\r
-       <version>3.0.11.Final</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.jaxrs</groupId>\r
-                                       <artifactId>jackson-jaxrs-json-provider</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-    </dependency>\r
 \r
                <dependency>\r
                        <groupId>org.onap.msb.java-sdk</groupId>\r
@@ -420,7 +344,7 @@
 \r
                <!--for yang tools-->\r
 <!--           <dependency>\r
-                       <groupId>org.openecomp.so</groupId>\r
+                       <groupId>org.onap.so</groupId>\r
                        <artifactId>common</artifactId>\r
                        <version>1.1.0-SNAPSHOT</version>\r
                </dependency>\r