From 8a00d4324ea7621df1a1febb8936df2807cbc443 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Fri, 9 Apr 2021 06:01:43 +0200 Subject: [PATCH] Upgrade to Java 11 Upgrade to Java 11 Issue-ID: DMAAP-1586 Signed-off-by: Ravi Pendurty Change-Id: Ibad435f4f33c0f25d3e030c0132d6c7cbf45a306 Signed-off-by: Ravi Pendurty --- pom.xml | 42 +++++++++++++--------- .../dmaap/mr/client/impl/MRBaseClientTest.java | 2 +- .../org/onap/dmaap/mr/tools/ApiKeyCommandTest.java | 2 ++ .../org/onap/dmaap/mr/tools/AuthCommandTest.java | 2 ++ .../onap/dmaap/mr/tools/ClusterCommandTest.java | 2 ++ .../onap/dmaap/mr/tools/MessageCommandTest.java | 2 ++ .../org/onap/dmaap/mr/tools/TopicCommandTest.java | 2 ++ .../org/onap/dmaap/mr/tools/TraceCommandTest.java | 2 ++ version.properties | 2 +- 9 files changed, 39 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 134971a..3555fd4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.dmaap.messagerouter.dmaapclient dmaapClient jar - 1.1.12-SNAPSHOT + 1.1.13-SNAPSHOT dmaap-messagerouter-dmaapclient Client library for MR event routing API https://gerrit.onap.org/r/gitweb?p=dmaap/messagerouter/dmaapclient.git @@ -39,10 +39,7 @@ - - 1.7 - 1.7 - 2.22.1 + 2.27 2.6.7.1 UTF-8 https://nexus.onap.org @@ -94,12 +91,12 @@ commons-codec commons-codec - 1.14 + 1.15 org.javassist javassist - 3.20.0-GA + 3.27.0-GA com.fasterxml.jackson.core @@ -158,7 +155,18 @@ 1.2.17 --> - + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + commons-io commons-io @@ -204,19 +212,19 @@ org.mockito mockito-core - 1.10.19 + 2.18.0 test org.powermock powermock-module-junit4 - 1.6.4 + 2.0.0-beta.5 test org.powermock - powermock-api-mockito - 1.6.4 + powermock-api-mockito2 + 2.0.0-beta.5 test @@ -292,6 +300,7 @@ maven-javadoc-plugin 2.10.4 + false -Xdoclint:none @@ -316,14 +325,13 @@ - + org.jacoco jacoco-maven-plugin diff --git a/src/test/java/org/onap/dmaap/mr/client/impl/MRBaseClientTest.java b/src/test/java/org/onap/dmaap/mr/client/impl/MRBaseClientTest.java index 235a83b..dc2c5ff 100644 --- a/src/test/java/org/onap/dmaap/mr/client/impl/MRBaseClientTest.java +++ b/src/test/java/org/onap/dmaap/mr/client/impl/MRBaseClientTest.java @@ -52,7 +52,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.http.conn.ssl.*") +@PowerMockIgnore({"org.apache.http.conn.ssl.*", "jdk.internal.reflect.*"}) @PrepareForTest({ DmaapClientUtil.class }) public class MRBaseClientTest { diff --git a/src/test/java/org/onap/dmaap/mr/tools/ApiKeyCommandTest.java b/src/test/java/org/onap/dmaap/mr/tools/ApiKeyCommandTest.java index e022bf5..f86d4f2 100644 --- a/src/test/java/org/onap/dmaap/mr/tools/ApiKeyCommandTest.java +++ b/src/test/java/org/onap/dmaap/mr/tools/ApiKeyCommandTest.java @@ -36,6 +36,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -49,6 +50,7 @@ import org.onap.dmaap.mr.client.MRIdentityManager; import org.onap.dmaap.mr.client.MRIdentityManager.ApiKey; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("jdk.internal.reflect.*") @PrepareForTest({ MRClientFactory.class }) public class ApiKeyCommandTest { diff --git a/src/test/java/org/onap/dmaap/mr/tools/AuthCommandTest.java b/src/test/java/org/onap/dmaap/mr/tools/AuthCommandTest.java index 9f9011a..e312d9b 100644 --- a/src/test/java/org/onap/dmaap/mr/tools/AuthCommandTest.java +++ b/src/test/java/org/onap/dmaap/mr/tools/AuthCommandTest.java @@ -31,11 +31,13 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; import com.att.nsa.cmdtool.CommandNotReadyException; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("jdk.internal.reflect.*") public class AuthCommandTest { @InjectMocks private AuthCommand command = null; diff --git a/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java b/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java index 0dc2f64..5d78488 100644 --- a/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java +++ b/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java @@ -34,11 +34,13 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; import com.att.nsa.cmdtool.CommandNotReadyException; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("jdk.internal.reflect.*") public class ClusterCommandTest { @InjectMocks private ClusterCommand command; diff --git a/src/test/java/org/onap/dmaap/mr/tools/MessageCommandTest.java b/src/test/java/org/onap/dmaap/mr/tools/MessageCommandTest.java index f32cb43..933ee48 100644 --- a/src/test/java/org/onap/dmaap/mr/tools/MessageCommandTest.java +++ b/src/test/java/org/onap/dmaap/mr/tools/MessageCommandTest.java @@ -37,6 +37,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -47,6 +48,7 @@ import org.onap.dmaap.mr.client.MRConsumer; import org.onap.dmaap.mr.client.MRTopicManager.TopicInfo; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("jdk.internal.reflect.*") @PrepareForTest({ MRClientFactory.class, ToolsUtil.class }) public class MessageCommandTest { @InjectMocks diff --git a/src/test/java/org/onap/dmaap/mr/tools/TopicCommandTest.java b/src/test/java/org/onap/dmaap/mr/tools/TopicCommandTest.java index e8dd073..4abd1e4 100644 --- a/src/test/java/org/onap/dmaap/mr/tools/TopicCommandTest.java +++ b/src/test/java/org/onap/dmaap/mr/tools/TopicCommandTest.java @@ -36,6 +36,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -47,6 +48,7 @@ import org.onap.dmaap.mr.client.MRTopicManager.TopicInfo; import org.onap.dmaap.mr.client.MRTopicManager; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("jdk.internal.reflect.*") @PrepareForTest({ MRClientFactory.class }) public class TopicCommandTest { @InjectMocks diff --git a/src/test/java/org/onap/dmaap/mr/tools/TraceCommandTest.java b/src/test/java/org/onap/dmaap/mr/tools/TraceCommandTest.java index de76acd..ab4d670 100644 --- a/src/test/java/org/onap/dmaap/mr/tools/TraceCommandTest.java +++ b/src/test/java/org/onap/dmaap/mr/tools/TraceCommandTest.java @@ -31,11 +31,13 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; import com.att.nsa.cmdtool.CommandNotReadyException; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("jdk.internal.reflect.*") public class TraceCommandTest { @InjectMocks private TraceCommand command; diff --git a/version.properties b/version.properties index cecd737..3dd3954 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=12 +patch=13 base_version=${major}.${minor}.${patch} -- 2.16.6