Upgraded to Java 11

Change-Id: Iee2bce6fad2076b1df093f1f978b2e78a64c6492
Issue-ID: HOLMES-302
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

1 files changed, 22 insertions, 35 deletions

diff --git a/pom.xml b/pom.xml
index 6738052..9ad5f21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright 2017 ZTE Corporation. Licensed under the Apache License, Version

+<!-- Copyright 2017-2020 ZTE Corporation. Licensed under the Apache License, Version

 	2.0 (the "License"); you may not use this file except in compliance with

 	the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

 	Unless required by applicable law or agreed to in writing, software distributed

 	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES

 	OR CONDITIONS OF ANY KIND, either express or implied. See the License for

 	the specific language governing permissions and limitations under the License. -->

-<!-- FM-ACTIVE POM DEFINITION -->

+

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.onap.oparent</groupId>

         <artifactId>oparent</artifactId>

-        <version>2.1.0</version>

+        <version>3.0.0</version>

     </parent>

 

     <groupId>org.onap.holmes.common</groupId>

     <artifactId>holmes-common-parent</artifactId>

     <packaging>pom</packaging>

 

-    <version>1.2.13-SNAPSHOT</version>

+    <version>1.3.0-SNAPSHOT</version>

     <name>holmes-common</name>

     <modules>

         <module>holmes-actions</module>

@@ -29,22 +29,21 @@
     <properties>

         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-        <maven.test.skip>false</maven.test.skip>

-        <powermock.version>1.7.1</powermock.version>

         <maven.test.failure.ignore>false</maven.test.failure.ignore>

+        <maven.test.skip>false</maven.test.skip>

+

         <finalName>${project.artifactId}-${project.version}</finalName>

         <release.dir>${basedir}/target</release.dir>

         <bundle.name>${project.artifactId}-${project.version}</bundle.name>

-        <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>

-        <excludesFile>**/*$*</excludesFile>

+

+        <powermock.version>2.0.7</powermock.version>

 

         <stringtemplate.version>3.2.1</stringtemplate.version>

-        <dropwizard.version>1.3.0</dropwizard.version>

-        <swagger.version>1.5.3</swagger.version>

-        <lombok.version>1.16.8</lombok.version>

-        <jersey.version>2.22.2</jersey.version>

+        <dropwizard.version>2.0.9</dropwizard.version>

+        <swagger.version>1.6.1</swagger.version>

+        <lombok.version>1.18.4</lombok.version>

+        <jersey.version>2.31</jersey.version>

         <slf4j.version>1.7.25</slf4j.version>

-

         <jacoco.version>0.8.5</jacoco.version>

         <sonar.coverage.jacoco.xmlReportPaths>

             ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml

@@ -54,6 +53,11 @@
     <dependencyManagement>

         <dependencies>

             <dependency>

+                <groupId>ch.qos.logback</groupId>

+                <artifactId>logback-classic</artifactId>

+                <version>1.2.3</version>

+            </dependency>

+            <dependency>

                 <groupId>org.onap.msb.java-sdk</groupId>

                 <artifactId>msb-java-sdk</artifactId>

                 <version>1.1.1</version>

@@ -79,23 +83,22 @@
                 <version>${dropwizard.version}</version>

                 <scope>provided</scope>

             </dependency>

-

             <dependency>

                 <groupId>io.dropwizard</groupId>

                 <artifactId>dropwizard-db</artifactId>

                 <version>${dropwizard.version}</version>

+                <scope>provided</scope>

             </dependency>

             <dependency>

                 <groupId>io.dropwizard</groupId>

                 <artifactId>dropwizard-jdbi</artifactId>

-                <version>${dropwizard.version}</version>

+                <version>2.0.0-rc9</version>

             </dependency>

             <dependency>

                 <groupId>io.swagger</groupId>

                 <artifactId>swagger-jersey2-jaxrs</artifactId>

                 <version>${swagger.version}</version>

             </dependency>

-

             <dependency>

                 <groupId>org.projectlombok</groupId>

                 <artifactId>lombok</artifactId>

@@ -127,7 +130,7 @@
             <dependency>

                 <groupId>org.easymock</groupId>

                 <artifactId>easymock</artifactId>

-                <version>3.0</version>

+                <version>4.2</version>

                 <scope>test</scope>

             </dependency>

             <dependency>

@@ -138,12 +141,6 @@
             </dependency>

             <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-rule</artifactId>

                 <version>${powermock.version}</version>

                 <scope>test</scope>

@@ -155,29 +152,19 @@
                 <scope>test</scope>

             </dependency>

             <dependency>

-                <groupId>org.apache.activemq</groupId>

-                <artifactId>activemq-broker</artifactId>

-                <version>5.15.6</version>

-            </dependency>

-            <dependency>

                 <groupId>org.apache.geronimo.specs</groupId>

                 <artifactId>geronimo-jms_1.1_spec</artifactId>

                 <version>1.1.1</version>

             </dependency>

             <dependency>

-                <groupId>org.apache.activemq</groupId>

-                <artifactId>activemq-pool</artifactId>

-                <version>5.15.6</version>

-            </dependency>

-            <dependency>

                 <groupId>org.apache.httpcomponents</groupId>

                 <artifactId>httpclient</artifactId>

-                <version>4.5.3</version>

+                <version>4.5.12</version>

             </dependency>

             <dependency>

                 <groupId>com.google.guava</groupId>

                 <artifactId>guava</artifactId>

-                <version>27.1-jre</version>

+                <version>29.0-jre</version>

             </dependency>

         </dependencies>

     </dependencyManagement>