diff options
13 files changed, 68 insertions, 87 deletions
diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml index e5a84e0..289a632 100644 --- a/engine-d-standalone/pom.xml +++ b/engine-d-standalone/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright 2017-2020 ZTE Corporation. + 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. @@ -126,6 +126,7 @@ <execution> <id>linux64</id> <configuration> + <tarLongFileMode>gnu</tarLongFileMode> <descriptors> <descriptor>linux64-assembly.xml</descriptor> </descriptors> @@ -134,7 +135,7 @@ </configuration> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile index a1f427a..13aa247 100644 --- a/engine-d-standalone/src/main/assembly/Dockerfile +++ b/engine-d-standalone/src/main/assembly/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/integration-java11:7.0.0 +FROM onap/integration-java17:12.0.0 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn> @@ -9,13 +9,13 @@ USER root EXPOSE 9102 9202 ENV HOSTNAME=holmes-engine-mgmt \ - LANG=C.UTF-8 + LANG=C.UTF-8 \ + PG_VERSION=12.2-r0 ADD holmes-engine-d-standalone-*-linux64.tar.gz /opt/onap/ -RUN apt-get upgrade \ - && apt-get update \ - && apt-get install -y curl postgresql-client-11 \ +RUN apk update \ + && apk add --no-cache curl postgresql-client \ && chmod -R a+rw /opt/onap/ \ && chmod -R a+rw /var/log/ \ && chmod 755 /opt/onap/bin/*.sh diff --git a/engine-d-standalone/src/main/assembly/bin/initDB.sh b/engine-d-standalone/src/main/assembly/bin/initDB.sh index 3472e31..2559442 100644 --- a/engine-d-standalone/src/main/assembly/bin/initDB.sh +++ b/engine-d-standalone/src/main/assembly/bin/initDB.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # -# Copyright 2017-2021 ZTE Corporation. +# 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. diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh index 1a5ab6d..19de786 100644 --- a/engine-d-standalone/src/main/assembly/bin/run.sh +++ b/engine-d-standalone/src/main/assembly/bin/run.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # -# Copyright 2017-2021 ZTE Corporation. +# 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. diff --git a/engine-d-standalone/src/main/assembly/bin/stop.sh b/engine-d-standalone/src/main/assembly/bin/stop.sh index 1b3b610..3d2c084 100644 --- a/engine-d-standalone/src/main/assembly/bin/stop.sh +++ b/engine-d-standalone/src/main/assembly/bin/stop.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # -# Copyright 2017-2021 ZTE Corporation. +# 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. diff --git a/engine-d/pom.xml b/engine-d/pom.xml index 1ff46dc..140ef94 100644 --- a/engine-d/pom.xml +++ b/engine-d/pom.xml @@ -67,11 +67,25 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>3.8.1</version> <configuration> - <source>8</source> - <target>8</target> - <release>11</release> + <source>17</source> + <target>17</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.1.2</version> + <configuration> + <argLine> + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/java.util.concurrent=ALL-UNNAMED + --add-opens=java.base/java.util.stream=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED + --add-opens=java.base/java.lang.reflect=ALL-UNNAMED + </argLine> </configuration> </plugin> <plugin> diff --git a/engine-d/src/main/java/org/onap/holmes/engine/Initializer.java b/engine-d/src/main/java/org/onap/holmes/engine/Initializer.java index 60869a1..850e961 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/Initializer.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/Initializer.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 ZTE Corporation. + * Copyright 2017-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. @@ -17,10 +17,10 @@ package org.onap.holmes.engine; import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.msb.entity.MicroServiceInfo; import org.onap.holmes.common.utils.CommonUtils; -import org.onap.holmes.common.utils.MsbRegister; -import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; -import org.onap.msb.sdk.discovery.entity.Node; +import org.onap.holmes.common.msb.entity.Node; +import org.onap.holmes.common.msb.MsbRegister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java b/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java index 1baa8ad..cbac482 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java @@ -18,7 +18,7 @@ package org.onap.holmes.engine.request; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java b/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java index 3e1b6ca..a2ab1ae 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java @@ -18,7 +18,7 @@ package org.onap.holmes.engine.request; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/engine-d/src/main/java/org/onap/holmes/engine/request/DmaapConfigRequest.java b/engine-d/src/main/java/org/onap/holmes/engine/request/DmaapConfigRequest.java index ede1d71..9968ee9 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/request/DmaapConfigRequest.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/request/DmaapConfigRequest.java @@ -16,10 +16,10 @@ package org.onap.holmes.engine.request; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; @Getter @Setter diff --git a/engine-d/src/main/resources/logback-spring.xml b/engine-d/src/main/resources/logback-spring.xml index eda9c6b..f399c7a 100644 --- a/engine-d/src/main/resources/logback-spring.xml +++ b/engine-d/src/main/resources/logback-spring.xml @@ -9,7 +9,7 @@ <charset>UTF-8</charset> </encoder> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>debug</level> + <level>DEBUG</level> </filter> </appender> @@ -27,7 +27,7 @@ <charset>UTF-8</charset> </encoder> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>info</level> + <level>INFO</level> </filter> </appender> @@ -45,9 +45,9 @@ <charset>UTF-8</charset> </encoder> <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <level>error</level> - <onMatch>deny</onMatch> - <onMismatch>accept</onMismatch> + <level>ERROR</level> + <onMatch>DENY</onMatch> + <onMismatch>ACCEPT</onMismatch> </filter> </appender> diff --git a/engine-d/src/test/java/org/onap/holmes/engine/InitializerTest.java b/engine-d/src/test/java/org/onap/holmes/engine/InitializerTest.java index 4dec23d..5ad7539 100644 --- a/engine-d/src/test/java/org/onap/holmes/engine/InitializerTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/InitializerTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2020-2022 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. You may obtain a copy of the License at @@ -18,8 +18,8 @@ import org.easymock.EasyMock; import org.junit.Test; import org.junit.runner.RunWith; import org.onap.holmes.common.config.MicroServiceConfig; -import org.onap.holmes.common.utils.MsbRegister; -import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; +import org.onap.holmes.common.msb.MsbRegister; +import org.onap.holmes.common.msb.entity.MicroServiceInfo; import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -18,11 +18,6 @@ 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>3.0.0</version> - </parent> <groupId>org.onap.holmes.engine-management</groupId> <artifactId>holmes-engine-parent</artifactId> @@ -46,19 +41,24 @@ <drools.version>7.62.0.Final</drools.version> <powermock.version>2.0.7</powermock.version> <jacoco.version>0.8.5</jacoco.version> - <springboot.version>2.7.2</springboot.version> - <jdbi.version>3.19.0</jdbi.version> - <jersey.version>3.0.5</jersey.version> + <springboot.version>3.1.4</springboot.version> + <jdbi.version>3.41.3</jdbi.version> + <jersey.version>3.1.3</jersey.version> <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version> + <slf4j.version>2.0.9</slf4j.version> <packagename>onap-holmes-engine-d</packagename> <linux64id>linux64</linux64id> <linux64outputdir>target/assembly/${linux64id}</linux64outputdir> <version.output>target/version</version.output> - <sonar.coverage.jacoco.xmlReportPaths> - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - </sonar.coverage.jacoco.xmlReportPaths> + <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> @@ -106,7 +106,7 @@ <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.16</version> + <version>1.18.28</version> </dependency> <dependency> <groupId>org.javassist</groupId> @@ -119,48 +119,9 @@ <version>3.2.2</version> </dependency> <dependency> - <groupId>org.onap.msb.java-sdk</groupId> - <artifactId>msb-java-sdk</artifactId> - <version>1.2.5</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>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - <exclusion> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>okhttp</artifactId> - </exclusion> - <exclusion> - <groupId>com.squareup.retrofit2</groupId> - <artifactId>retrofit</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.onap.holmes.common</groupId> <artifactId>holmes-actions</artifactId> - <version>1.4.6</version> + <version>1.4.7</version> <exclusions> <exclusion> <groupId>io.swagger</groupId> @@ -183,11 +144,16 @@ <version>4.0.0</version> </dependency> <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.3.1</version> </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> @@ -260,7 +226,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -270,7 +236,7 @@ <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.4.19</version> + <version>1.4.20</version> </dependency> <dependency> <groupId>org.glassfish.jersey.inject</groupId> |