Fix GPL-2.0 license issues

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

diff --git a/pom.xml b/pom.xml
index 51757f7..e67e4ca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
        <groupId>org.onap.aai.model-loader</groupId>
        <artifactId>model-loader</artifactId>
-       <version>1.1.0-SNAPSHOT</version>
+       <version>1.2.0-SNAPSHOT</version>
        <name>aai-model-loader</name>
 
        <properties>
@@ -101,17 +101,17 @@
                        <version>1.6.2</version>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-javaagent</artifactId>
-                       <version>1.6.2</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>
                <!-- xjc dependencies -->
                <dependency>
@@ -384,31 +384,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>