From 8a00d4324ea7621df1a1febb8936df2807cbc443 Mon Sep 17 00:00:00 2001
From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Fri, 9 Apr 2021 06:01:43 +0200
Subject: 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>
---
 pom.xml | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 134971a..3555fd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
-- 
cgit 1.2.3-korg