summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-09-27 11:43:14 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-27 11:43:14 +0000
commit9b76e95681b00ba87c9affbe43ecb502c8c574f9 (patch)
tree742514ac3e47649c8ee3cca14a800e41641f8ba9
parent82425921bbc9de28667a795a5d2172c125f380c2 (diff)
parentd716c36868f9d3ea283e8e4bc54eac8da0a92bf4 (diff)
Merge "Use powermock version from parent pom"
-rw-r--r--common-logging/pom.xml5
-rw-r--r--integrity-monitor/pom.xml5
-rw-r--r--utils-test/pom.xml1
-rw-r--r--utils/pom.xml25
-rw-r--r--utils/src/test/java/org/onap/policy/common/utils/network/NetworkUtilTest.java2
5 files changed, 1 insertions, 37 deletions
diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 2d3186b9..e32014fe 100644
--- 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 9a25c000..2255138b 100644
--- 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 c87da916..d069d0db 100644
--- 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 4b0f03ba..82f07b38 100644
--- 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 1e402d2a..6dd09d6e 100644
--- 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());
}