Remove dependency on org.powermock (PowerMockito)

[aai/model-loader.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 242b623..f45e580 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
                <commons-compress.version>1.14</commons-compress.version>
                <fasterxml.version>2.8.1</fasterxml.version>
                <mockito.version>1.10.19</mockito.version>
-               <powermock.version>1.6.2</powermock.version>
                <jsr311-api.version>1.1.1</jsr311-api.version>
                <jersey-client.version>1.18</jersey-client.version>
                <gson.version>2.7</gson.version>
@@ -80,7 +79,7 @@
                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
                <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
                <sonar.projectVersion>${project.version}</sonar.projectVersion>
-               <nexusproxy>https://nexus.openecomp.org</nexusproxy>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
                <babel.version>1.2.0-SNAPSHOT</babel.version>
                <aai.rest.client.version>1.2.1</aai.rest.client.version>
        </properties>
@@ -151,30 +150,6 @@
                        <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <version>${powermock.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <version>${powermock.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4-rule-agent</artifactId>
-                       <version>1.6.2</version>
-                       <scope>test</scope>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>powermock-module-javaagent</artifactId>
-                                       <groupId>org.powermock</groupId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
                <dependency>
                        <groupId>org.javassist</groupId>
                        <artifactId>javassist</artifactId>
@@ -300,6 +275,29 @@
                        <url>http://www.evosuite.org/m2</url>
                </pluginRepository>
        </pluginRepositories>
+       
+       <repositories>
+               <repository>
+                       <id>central</id>
+                       <name>Maven 2 repository 2</name>
+                       <url>http://repo2.maven.org/maven2/</url>
+               </repository>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>ECOMP Release Repository</name>
+                       <url>${nexusproxy}/content/repositories/releases/</url>
+               </repository>
+               <repository>
+                       <id>ecomp-snapshots</id>
+                       <name>ECOMP Snapshot Repository</name>
+                       <url>${nexusproxy}/content/repositories/snapshots/</url>
+               </repository>
+               <repository>
+                       <id>ecomp-staging</id>
+                       <name>ECOMP Staging Repository</name>
+                       <url>${nexusproxy}/content/repositories/staging/</url>
+               </repository>
+       </repositories>
 
        <profiles>
                <profile>
@@ -453,7 +451,7 @@
                                <configuration>
                                        <verbose>true</verbose>
                                        <serverId>docker-hub</serverId>
-                                       <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
+                                       <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
                                        <dockerDirectory>${docker.location}</dockerDirectory>
                                        <imageTags>
                                                <imageTag>latest</imageTag>
@@ -461,31 +459,6 @@
                                        <forceTags>true</forceTags>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>2.8</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-agent</id>
-                                               <phase>process-test-classes</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>org.powermock</groupId>
-                                                                       <artifactId>powermock-module-javaagent</artifactId>
-                                                                       <version>1.6.2</version>
-                                                                       <outputDirectory>${project.build.directory}/agents</outputDirectory>
-                                                                       <destFileName>powermock-javaagent.jar</destFileName>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
@@ -524,7 +497,7 @@
                                </configuration>
                        </plugin>
 
-                       <!-- license plugin
+                       <!-- license plugin -->
                        <plugin>
                                <groupId>com.mycila</groupId>
                                <artifactId>license-maven-plugin</artifactId>
@@ -545,7 +518,7 @@
                                        </execution>
                                </executions>
                        </plugin>
-                        -->
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>