Updated the repo to support JDK 17

1. Removed oparent.
2. Supported JDK 17.

Issue-ID: HOLMES-629
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I4635dff74a9654cf02600aba9650a67af1ba818a

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index b09b882..f132e80 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>\r
         <groupId>org.onap.holmes.common</groupId>\r
         <artifactId>holmes-common-parent</artifactId>\r
-        <version>1.4.6-SNAPSHOT</version>\r
+        <version>1.4.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <name>holmes-common-service</name>\r
@@ -143,11 +143,24 @@
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>3.8.0</version>\r
+                <version>3.8.1</version>\r
                 <configuration>\r
-                    <source>1.8</source>\r
-                    <target>1.8</target>\r
-                    <release>11</release>\r
+                    <source>17</source>\r
+                    <target>17</target>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <artifactId>maven-surefire-plugin</artifactId>\r
+                <version>3.1.2</version>\r
+                <configuration>\r
+                    <argLine>\r
+                        --add-opens=java.base/java.lang=ALL-UNNAMED\r
+                        --add-opens=java.base/java.net=ALL-UNNAMED\r
+                        --add-opens=java.base/java.util=ALL-UNNAMED\r
+                        --add-opens=java.base/java.util.concurrent=ALL-UNNAMED\r
+                        --add-opens=java.base/java.util.stream=ALL-UNNAMED\r
+                        --add-opens=java.base/java.io=ALL-UNNAMED\r
+                    </argLine>\r
                 </configuration>\r
             </plugin>\r
         </plugins>\r

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
index 0430e28..0df99b5 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2021 ZTE Corporation.
+ * Copyright 2018-2023 ZTE Corporation.
  * <p>
  * 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
@@ -25,6 +25,7 @@ import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.common.utils.JerseyClient;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
@@ -39,6 +40,7 @@ import static org.junit.Assert.assertThat;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(JerseyClient.class)
+@SuppressStaticInitializationFor("org.onap.holmes.common.utils.JerseyClient")
 public class AaiQuery4CcvpnTest {
 
     @Rule

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
index cb16650..3687299 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 ZTE Corporation.
+ * Copyright 2020 - 2023 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,6 +118,7 @@ class EngineEntityDaoStub implements EngineEntityDao {
 
     @Override
     public void updateEntity(EngineEntity entity) {
+        entitySet.remove(entity);
         entitySet.add(entity);
     }
 

diff --git a/pom.xml b/pom.xml
index 2af85ea..14384fc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,200 +1,201 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- Copyright 2017-2023 ZTE Corporation. Licensed under the Apache License, Version\r
-       2.0 (the "License"); you may not use this file except in compliance with\r
-       the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0\r
-       Unless required by applicable law or agreed to in writing, software distributed\r
-       under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES\r
-       OR CONDITIONS OF ANY KIND, either express or implied. See the License for\r
-       the specific language governing permissions and limitations under the License. -->\r
-\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <parent>\r
-        <groupId>org.onap.oparent</groupId>\r
-        <artifactId>oparent</artifactId>\r
-        <version>3.0.0</version>\r
-    </parent>\r
-\r
-    <groupId>org.onap.holmes.common</groupId>\r
-    <artifactId>holmes-common-parent</artifactId>\r
-    <packaging>pom</packaging>\r
-\r
-    <version>1.4.6-SNAPSHOT</version>\r
-    <name>holmes-common</name>\r
-    <modules>\r
-        <module>holmes-actions</module>\r
-    </modules>\r
-\r
-    <properties>\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-        <maven.test.failure.ignore>false</maven.test.failure.ignore>\r
-        <maven.test.skip>false</maven.test.skip>\r
-\r
-        <finalName>${project.artifactId}-${project.version}</finalName>\r
-        <release.dir>${basedir}/target</release.dir>\r
-        <bundle.name>${project.artifactId}-${project.version}</bundle.name>\r
-\r
-        <powermock.version>2.0.7</powermock.version>\r
-        <springboot.version>2.7.2</springboot.version>\r
-        <spring-framework.version>5.3.13</spring-framework.version>\r
-        <jdbi.version>3.19.0</jdbi.version>\r
-\r
-        <dropwizard.version>2.0.9</dropwizard.version>\r
-        <swagger.version>1.6.4</swagger.version>\r
-        <lombok.version>1.18.4</lombok.version>\r
-        <jersey.version>3.0.5</jersey.version>\r
-        <jersey.scope>compile</jersey.scope>\r
-        <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>\r
-        <slf4j.version>1.7.25</slf4j.version>\r
-        <jacoco.version>0.8.5</jacoco.version>\r
-        <jackson.version>2.13.3</jackson.version>\r
-        <sonar.coverage.jacoco.xmlReportPaths>\r
-            ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml\r
-        </sonar.coverage.jacoco.xmlReportPaths>\r
-    </properties>\r
-\r
-    <dependencyManagement>\r
-        <dependencies>\r
-            <dependency>\r
-                <groupId>org.springframework.boot</groupId>\r
-                <artifactId>spring-boot-dependencies</artifactId>\r
-                <version>${springboot.version}</version>\r
-                <type>pom</type>\r
-                <scope>import</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.springframework</groupId>\r
-                <artifactId>spring-jdbc</artifactId>\r
-                <version>${spring-framework.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.springframework</groupId>\r
-                <artifactId>spring-web</artifactId>\r
-                <version>${spring-framework.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jdbi</groupId>\r
-                <artifactId>jdbi3-postgres</artifactId>\r
-                <version>${jdbi.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jdbi</groupId>\r
-                <artifactId>jdbi3-sqlobject</artifactId>\r
-                <version>${jdbi.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>javax.servlet</groupId>\r
-                <artifactId>javax.servlet-api</artifactId>\r
-                <version>4.0.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.onap.msb.java-sdk</groupId>\r
-                <artifactId>msb-java-sdk</artifactId>\r
-                <version>1.2.5</version>\r
-                <exclusions>\r
-                    <exclusion>\r
-                        <groupId>com.fasterxml.jackson.core</groupId>\r
-                        <artifactId>jackson-databind</artifactId>\r
-                    </exclusion>\r
-                </exclusions>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.glassfish.jersey.containers</groupId>\r
-                <artifactId>jersey-container-servlet-core</artifactId>\r
-                <version>${jersey.version}</version>\r
-                <scope>${jersey.scope}</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.glassfish.jersey.core</groupId>\r
-                <artifactId>jersey-common</artifactId>\r
-                <version>${jersey.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.glassfish.jersey.core</groupId>\r
-                <artifactId>jersey-client</artifactId>\r
-                <version>${jersey.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.projectlombok</groupId>\r
-                <artifactId>lombok</artifactId>\r
-                <version>${lombok.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>junit</groupId>\r
-                <artifactId>junit</artifactId>\r
-                <version>4.8.2</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.hamcrest</groupId>\r
-                <artifactId>hamcrest-core</artifactId>\r
-                <version>1.3</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.powermock</groupId>\r
-                <artifactId>powermock-module-junit4</artifactId>\r
-                <version>${powermock.version}</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.easymock</groupId>\r
-                <artifactId>easymock</artifactId>\r
-                <version>4.2</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.powermock</groupId>\r
-                <artifactId>powermock-api-easymock</artifactId>\r
-                <version>${powermock.version}</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>com.google.guava</groupId>\r
-                <artifactId>guava</artifactId>\r
-                <version>29.0-jre</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>com.google.code.gson</groupId>\r
-                <artifactId>gson</artifactId>\r
-                <version>2.8.9</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>jakarta.ws.rs</groupId>\r
-                <artifactId>jakarta.ws.rs-api</artifactId>\r
-                <version>${jakarta.ws.rs.version}</version>\r
-            </dependency>\r
-        </dependencies>\r
-    </dependencyManagement>\r
-\r
-    <build>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.jacoco</groupId>\r
-                <artifactId>jacoco-maven-plugin</artifactId>\r
-                <version>${jacoco.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>prepare-agent</id>\r
-                        <goals>\r
-                            <goal>prepare-agent</goal>\r
-                        </goals>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>report</id>\r
-                        <goals>\r
-                            <goal>report</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>\r
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-</project>\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017-2023 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. -->
+
+<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>
+
+    <groupId>org.onap.holmes.common</groupId>
+    <artifactId>holmes-common-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <version>1.4.7-SNAPSHOT</version>
+    <name>holmes-common</name>
+    <modules>
+        <module>holmes-actions</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <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>
+
+        <powermock.version>2.0.7</powermock.version>
+        <springboot.version>2.7.2</springboot.version>
+        <spring-framework.version>5.3.13</spring-framework.version>
+        <jdbi.version>3.19.0</jdbi.version>
+
+        <dropwizard.version>2.0.9</dropwizard.version>
+        <swagger.version>1.6.4</swagger.version>
+        <lombok.version>1.18.28</lombok.version>
+        <jersey.version>3.0.5</jersey.version>
+        <jersey.scope>compile</jersey.scope>
+        <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <jacoco.version>0.8.5</jacoco.version>
+        <jackson.version>2.13.3</jackson.version>
+
+        <jacoco.version>0.8.5</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
+        <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${springboot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${spring-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${spring-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jdbi</groupId>
+                <artifactId>jdbi3-postgres</artifactId>
+                <version>${jdbi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jdbi</groupId>
+                <artifactId>jdbi3-sqlobject</artifactId>
+                <version>${jdbi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>4.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.msb.java-sdk</groupId>
+                <artifactId>msb-java-sdk</artifactId>
+                <version>1.2.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.containers</groupId>
+                <artifactId>jersey-container-servlet-core</artifactId>
+                <version>${jersey.version}</version>
+                <scope>${jersey.scope}</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-common</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.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.easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>4.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-easymock</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>30.0-jre</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.8.9</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>${jakarta.ws.rs.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+