Merge "Reorder modifiers"

[so.git] / packages / arquillian-unit-tests / pom.xml

diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml
index 257e34b..aac1ed0 100644 (file)
--- a/packages/arquillian-unit-tests/pom.xml
+++ b/packages/arquillian-unit-tests/pom.xml
@@ -2,12 +2,12 @@
   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.so</groupId>
+    <groupId>org.onap.so</groupId>
     <artifactId>packages</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.openecomp.so.packages</groupId>
+  <groupId>org.onap.so.packages</groupId>
   <name>Arquillian Unit Testing on MSO</name>
   <artifactId>arquillian-unit-tests</artifactId>
 
@@ -197,7 +197,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.so</groupId>
+      <groupId>org.onap.so</groupId>
       <artifactId>asdc-controller</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -205,28 +205,14 @@
     </dependency>
 
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <scope>test</scope>
-      <version>2.8.7</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+      <groupId>org.onap.sdc.sdc-distribution-client</groupId>
       <artifactId>sdc-distribution-client</artifactId>
-      <version>1.1.6-SNAPSHOT</version>
+      <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.so</groupId>
+      <groupId>org.onap.so</groupId>
       <artifactId>mso-catalog-db</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -295,6 +281,7 @@
       <plugin>
         <groupId>org.codehaus.groovy.maven</groupId>
         <artifactId>gmaven-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>
@@ -325,7 +312,7 @@
       </plugin>
 
 
-      <plugin>
+      <!-- <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>wagon-maven-plugin</artifactId>
         <version>1.0</version>
@@ -343,7 +330,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin> -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -386,6 +373,40 @@
         </configuration>
       </plugin>
     </plugins>
+    <pluginManagement>
+       <plugins>
+               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+               <!-- Added to ensure that eclipse doesn't complain about executing gmaven during the generate-resources phase of the build. -->
+               <plugin>
+                       <groupId>org.eclipse.m2e</groupId>
+                       <artifactId>lifecycle-mapping</artifactId>
+                       <version>1.0.0</version>
+                       <configuration>
+                               <lifecycleMappingMetadata>
+                                       <pluginExecutions>
+                                               <pluginExecution>
+                                                       <pluginExecutionFilter>
+                                                               <groupId>
+                                                                       org.codehaus.groovy.maven
+                                                               </groupId>
+                                                               <artifactId>
+                                                                       gmaven-plugin
+                                                               </artifactId>
+                                                               <versionRange>[1.0,)</versionRange>
+                                                               <goals>
+                                                                       <goal>execute</goal>
+                                                               </goals>
+                                                       </pluginExecutionFilter>
+                                                       <action>
+                                                               <ignore></ignore>
+                                                       </action>
+                                               </pluginExecution>
+                                       </pluginExecutions>
+                               </lifecycleMappingMetadata>
+                       </configuration>
+               </plugin>
+       </plugins>
+    </pluginManagement>
   </build>
 
 </project>