From 65ba7b2224d804f873901ab6279f097edbc18fd3 Mon Sep 17 00:00:00 2001
From: JerzySzachniewicz <jerzy.szachniewicz@nokia.com>
Date: Fri, 24 Jul 2020 08:15:30 +0200
Subject: Upgrade to Java11

Add 2 maven profiles to java11 and java7.
upgrade jackson libraries to 2.11.1

Issue-ID: SO-3073
Signed-off-by: JerzySzachniewicz <jerzy.szachniewicz@nokia.com>
Change-Id: I9c0d97de53783a8a9ca99780f9de96f284a17b37
Signed-off-by: JerzySzachniewicz <jerzy.szachniewicz@nokia.com>
---
 pom.xml | 73 +++++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index dbef9ed..1d6cfa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,22 +167,68 @@
         <format.skipExecute>false</format.skipExecute>
       </properties>
     </profile>
+    <profile>
+      <id>java11</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.1</version>
+            <configuration>
+              <forceJavacCompilerUse>true</forceJavacCompilerUse>
+              <source>11</source>
+              <target>11</target>
+              <release>11</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>java7</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.1</version>
+            <configuration>
+              <source>1.7</source>
+              <target>1.7</target>
+              <encoding>UTF-8</encoding>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
   </profiles>
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.8</version>
+      <version>2.11.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.8</version>
+      <version>2.11.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.9.8</version>
+      <version>2.11.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.1</version>
     </dependency>
   </dependencies>
   <reporting>
@@ -234,17 +280,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.19.1</version>
       </plugin>
-      <!-- <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <nexusUrl>${nexusproxy}</nexusUrl>
-          <stagingProfileId>176c31dfe190a</stagingProfileId>
-          <serverId>ecomp-staging</serverId>
-        </configuration>
-      </plugin> -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -253,16 +288,6 @@
           <skip />
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
-- 
cgit 1.2.3-korg