Use powermock version from parent pom

Change-Id: I84fd562e7050508a75b4192ba162a09acd938986
Issue-ID: POLICY-1148
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 2d3186b..e32014f 100644 (file)
--- a/common-logging/pom.xml
+++ b/common-logging/pom.xml
@@ -33,10 +33,6 @@
     <description>ONAP Logging Framework</description>
     <packaging>jar</packaging>
 
-    <properties>
-        <powermock.version>1.6.6</powermock.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>log4j</groupId>
@@ -60,7 +56,6 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml
index 9a25c00..2255138 100644 (file)
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/pom.xml
@@ -35,15 +35,10 @@
 
        <name>Integrity Monitor</name>
        
-       <properties>
-        <powermock.version>1.6.6</powermock.version>
-    </properties>
-       
        <dependencies>
                <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
                <dependency>

diff --git a/utils-test/pom.xml b/utils-test/pom.xml
index c87da91..d069d0d 100644 (file)
--- a/utils-test/pom.xml
+++ b/utils-test/pom.xml
@@ -54,7 +54,6 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/utils/pom.xml b/utils/pom.xml
index 4b0f03b..82f07b3 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -32,11 +32,6 @@
     <description>Common Utilities</description>
     <packaging>jar</packaging>
 
-    <properties>
-        <powermock.version>1.6.6</powermock.version>
-        <slf4j.version>1.7.25</slf4j.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -60,32 +55,12 @@
         <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</artifactId>
-            <version>${powermock.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.powermock</groupId>
-                    <artifactId>powermock-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.powermock</groupId>
-                    <artifactId>powermock-reflect</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.javassist</groupId>
-                    <artifactId>javassist</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.openpojo</groupId>

diff --git a/utils/src/test/java/org/onap/policy/common/utils/network/NetworkUtilTest.java b/utils/src/test/java/org/onap/policy/common/utils/network/NetworkUtilTest.java
index 1e402d2..6dd09d6 100644 (file)
--- a/utils/src/test/java/org/onap/policy/common/utils/network/NetworkUtilTest.java
+++ b/utils/src/test/java/org/onap/policy/common/utils/network/NetworkUtilTest.java
@@ -32,7 +32,7 @@ public class NetworkUtilTest {
     @Test
     public void test() throws InterruptedException, IOException {
         assertNotNull(NetworkUtil.IPv4_WILDCARD_ADDRESS);
-        assertFalse(NetworkUtil.isTcpPortOpen("localhost", 8080, 1, 5));
+        assertFalse(NetworkUtil.isTcpPortOpen("localhost", 8180, 1, 5));
         assertNotNull(NetworkUtil.getHostname());
         assertNotNull(NetworkUtil.getHostIp());
     }