Updated to Java 11

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

1 files changed, 265 insertions, 114 deletions

diff --git a/pom.xml b/pom.xml
index 8e3537a..07b5f60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  ~ Copyright 2017 ZTE Corporation.

+  ~ 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.

@@ -19,7 +19,7 @@
     <parent>

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

         <artifactId>oparent</artifactId>

-        <version>2.1.0</version>

+        <version>3.0.0</version>

     </parent>

 

     <groupId>org.onap.holmes.rule-management</groupId>

@@ -34,135 +34,286 @@
     </modules>

 

     <properties>

+        <packagename>onap-holmes-rulemgt</packagename>

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

+

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

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

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

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

-        <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>

-        <nexusproxy>https://nexus.open-o.org/content</nexusproxy>

-        <powermock.version>1.6.5</powermock.version>

 

-

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

-        <dropwizard.version>1.3.9</dropwizard.version>

-        <reflections.version>0.9.9</reflections.version>

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

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

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

-        <jaxrs.consumer.version>5.0</jaxrs.consumer.version>

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

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

+        <jersey.version>2.30.1</jersey.version>

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

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

-        <postgres.jdbc.driver.version>42.2.5</postgres.jdbc.driver.version>

-

 

-        <packagename>onap-holmes-rulemgt</packagename>

         <linux64id>linux64</linux64id>

-        <win64id>win64</win64id>

         <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>

-        <win64outputdir>target/assembly/${win64id}</win64outputdir>

         <version.output>target/version</version.output>

 

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

         <sonar.coverage.jacoco.xmlReportPaths>

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

         </sonar.coverage.jacoco.xmlReportPaths>

     </properties>

-    <dependencyManagement>

-        <dependencies>

-            <dependency>

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

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

-                <version>1.1.1</version>

-            </dependency>

-            <dependency>

-                <groupId>org.reflections</groupId>

-                <artifactId>reflections</artifactId>

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

-            </dependency>

-            <dependency>

-                <groupId>org.easymock</groupId>

-                <artifactId>easymock</artifactId>

-                <version>3.0</version>

-            </dependency>

-            <dependency>

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

-                <artifactId>holmes-actions</artifactId>

-                <version>1.2.13</version>

-            </dependency>

-            <dependency>

-                <groupId>io.dropwizard</groupId>

-                <artifactId>dropwizard-core</artifactId>

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

-            </dependency>

-            <dependency>

-                <groupId>io.dropwizard</groupId>

-                <artifactId>dropwizard-db</artifactId>

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

-            </dependency>

-            <dependency>

-                <groupId>io.dropwizard</groupId>

-                <artifactId>dropwizard-jdbi</artifactId>

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

-            </dependency>

-            <dependency>

-                <groupId>io.swagger</groupId>

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

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

-                <scope>provided</scope>

-            </dependency>

-

-            <dependency>

-                <groupId>org.projectlombok</groupId>

-                <artifactId>lombok</artifactId>

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

-            </dependency>

-

-

-            <dependency>

-                <groupId>org.slf4j</groupId>

-                <artifactId>slf4j-api</artifactId>

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

-            </dependency>

-

-            <dependency>

-                <groupId>org.postgresql</groupId>

-                <artifactId>postgresql</artifactId>

-                <version>${postgres.jdbc.driver.version}</version>

-            </dependency>

-

-

-            <dependency>

-                <groupId>org.antlr</groupId>

-                <artifactId>stringtemplate</artifactId>

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

-            </dependency>

-

-            <dependency>

-                <groupId>junit</groupId>

-                <artifactId>junit</artifactId>

-                <version>4.8.2</version>

-                <scope>test</scope>

-            </dependency>

-

-            <dependency>

-                <groupId>org.hamcrest</groupId>

-                <artifactId>hamcrest-core</artifactId>

-                <version>1.3</version>

-                <scope>test</scope>

-            </dependency>

-

-            <dependency>

-                <groupId>org.powermock</groupId>

-                <artifactId>powermock-module-junit4</artifactId>

-                <version>1.6.5</version>

-                <scope>test</scope>

-            </dependency>

 

-        </dependencies>

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

+            <exclusions>

+                <exclusion>

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

+                    <artifactId>logback-classic</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>com.fasterxml.jackson.core</groupId>

+                    <artifactId>jackson-databind</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>com.fasterxml.jackson.core</groupId>

+                    <artifactId>jackson-core</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>com.squareup.okhttp3</groupId>

+                    <artifactId>okhttp</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.eclipse.jetty</groupId>

+                    <artifactId>jetty-server</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.reflections</groupId>

+            <artifactId>reflections</artifactId>

+            <version>0.9.9</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>holmes-actions</artifactId>

+            <version>1.2.13</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.glassfish.jersey.containers</groupId>

+                    <artifactId>jersey-container-servlet-core</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>io.swagger</groupId>

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

+                </exclusion>

+                <exclusion>

+                    <groupId>org.slf4j</groupId>

+                    <artifactId>slf4j-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.easymock</groupId>

+            <artifactId>easymock</artifactId>

+            <version>4.2</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>io.dropwizard</groupId>

+            <artifactId>dropwizard-core</artifactId>

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

+        </dependency>

+        <dependency>

+            <groupId>io.dropwizard</groupId>

+            <artifactId>dropwizard-db</artifactId>

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

+        </dependency>

+        <dependency>

+            <groupId>io.dropwizard</groupId>

+            <artifactId>dropwizard-jdbi</artifactId>

+            <version>2.0.0-rc9</version>

+        </dependency>

+        <dependency>

+            <groupId>org.antlr</groupId>

+            <artifactId>stringtemplate</artifactId>

+            <version>3.2.1</version>

+        </dependency>

+        <dependency>

+            <groupId>com.squareup.okhttp3</groupId>

+            <artifactId>okhttp</artifactId>

+            <version>3.14.1</version>

+        </dependency>

+        <dependency>

+            <groupId>org.projectlombok</groupId>

+            <artifactId>lombok</artifactId>

+            <version>1.18.4</version>

+        </dependency>

+        <dependency>

+            <groupId>org.postgresql</groupId>

+            <artifactId>postgresql</artifactId>

+            <version>42.2.5</version>

+        </dependency>

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.8.2</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.hamcrest</groupId>

+            <artifactId>hamcrest-core</artifactId>

+            <version>1.3</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-module-junit4</artifactId>

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

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>slf4j-api</artifactId>

+            <version>${slf4j.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>io.swagger</groupId>

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

+            <version>1.5.3</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>com.fasterxml.jackson.core</groupId>

+                    <artifactId>jackson-databind</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>com.fasterxml.jackson.core</groupId>

+                    <artifactId>jackson-core</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>com.fasterxml.jackson.dataformat</groupId>

+                    <artifactId>jackson-dataformat-xml</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>javax.validation</groupId>

+                    <artifactId>validation-api</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.glassfish.jersey.containers</groupId>

+                    <artifactId>jersey-container-servlet-core</artifactId>

+                </exclusion>

+            </exclusions>

+            <scope>provided</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-api-easymock</artifactId>

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

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.mockito</groupId>

+            <artifactId>mockito-core</artifactId>

+            <version>2.18.0</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-core</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>

+        </dependency>

+        <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-api-mockito2</artifactId>

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

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.javassist</groupId>

+            <artifactId>javassist</artifactId>

+            <version>3.24.1-GA</version>

+        </dependency>

+        <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-classloading-xstream</artifactId>

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

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>io.reactivex.rxjava2</groupId>

+            <artifactId>rxjava</artifactId>

+            <version>2.1.5</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.hamcrest</groupId>

+            <artifactId>hamcrest-library</artifactId>

+            <version>1.3</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>com.googlecode.json-simple</groupId>

+            <artifactId>json-simple</artifactId>

+            <version>1.1.1</version>

+        </dependency>

+        <dependency>

+            <groupId>net.sf.json-lib</groupId>

+            <artifactId>json-lib</artifactId>

+            <version>2.4</version>

+            <classifier>jdk15</classifier>

+            <exclusions>

+                <exclusion>

+                    <groupId>commons-collections</groupId>

+                    <artifactId>commons-collections</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>commons-beanutils</groupId>

+                    <artifactId>commons-beanutils</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>commons-collections</groupId>

+            <artifactId>commons-collections</artifactId>

+            <version>3.2.2</version>

+        </dependency>

+        <dependency>

+            <groupId>com.alibaba</groupId>

+            <artifactId>fastjson</artifactId>

+            <version>1.2.49</version>

+        </dependency>

+        <dependency>

+            <groupId>org.glassfish.jersey.core</groupId>

+            <artifactId>jersey-server</artifactId>

+            <version>${jersey.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>javax.validation</groupId>

+                    <artifactId>validation-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.glassfish.jersey.core</groupId>

+            <artifactId>jersey-client</artifactId>

+            <version>${jersey.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.glassfish.jersey.core</groupId>

+            <artifactId>jersey-common</artifactId>

+            <version>${jersey.version}</version>

+        </dependency>

+    </dependencies>

 

     <build>

         <plugins>