diff options
author | Ravi Pendurty <ravi.pendurty@highstreet-technologies.com> | 2021-04-09 06:01:43 +0200 |
---|---|---|
committer | Ravi Pendurty <ravi.pendurty@highstreet-technologies.com> | 2021-04-12 11:36:11 +0200 |
commit | 8a00d4324ea7621df1a1febb8936df2807cbc443 (patch) | |
tree | 954c58d86657a81d4fb1c76e82758e17a0a47d73 | |
parent | abe4681722ff1fa897454e5bc1703ef446201a78 (diff) |
Upgrade to Java 11
Upgrade to Java 11
Issue-ID: DMAAP-1586
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: Ibad435f4f33c0f25d3e030c0132d6c7cbf45a306
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
9 files changed, 39 insertions, 19 deletions
@@ -27,7 +27,7 @@ <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> <packaging>jar</packaging> - <version>1.1.12-SNAPSHOT</version> + <version>1.1.13-SNAPSHOT</version> <name>dmaap-messagerouter-dmaapclient</name> <description>Client library for MR event routing API</description> <url>https://gerrit.onap.org/r/gitweb?p=dmaap/messagerouter/dmaapclient.git</url> @@ -39,10 +39,7 @@ </parent> <properties> - <!-- for the client library, we want to allow 1.6 or later --> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> - <jersey.version>2.22.1</jersey.version> + <jersey.version>2.27</jersey.version> <version.jackson.core>2.6.7.1</version.jackson.core> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -94,12 +91,12 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.14</version> + <version>1.15</version> </dependency> <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.20.0-GA</version> + <version>3.27.0-GA</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -158,7 +155,18 @@ <version>1.2.17</version> </dependency> --> <!-- End - Dependency on log4j for logging purpose --> - + <!-- API, java.xml.bind module --> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>2.3.2</version> + </dependency> + <!-- Runtime, com.sun.xml.bind module --> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -204,19 +212,19 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.10.19</version> + <version>2.18.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.4</version> + <version>2.0.0-beta.5</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.4</version> + <artifactId>powermock-api-mockito2</artifactId> + <version>2.0.0-beta.5</version> <scope>test</scope> </dependency> <dependency> @@ -292,6 +300,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.10.4</version> <configuration> + <detectJavaApiLink>false</detectJavaApiLink> <additionalparam>-Xdoclint:none</additionalparam> </configuration> <executions> @@ -316,14 +325,13 @@ </execution> </executions> </plugin> - <plugin> + <!--<plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.8.1</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <release>11</release> </configuration> - </plugin> + </plugin>--> <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> 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} |