From 7d089b31e7b8b1aecb4bcef5d9039f4d3614ea46 Mon Sep 17 00:00:00 2001 From: "denilson.l65" Date: Fri, 10 Dec 2021 16:03:26 +0000 Subject: [DCAEGEN2] Use onap/integration-java11 image Use onap/integration-java11 image in sliceanalysis ms Issue-ID: DCAEGEN2-2963 Signed-off-by: denilson.l65 Change-Id: Ib121ddaa2921ce4443e8a858867394d25e2c98eb --- components/slice-analysis-ms/ChangeLog.md | 8 +- components/slice-analysis-ms/entry.sh | 4 +- components/slice-analysis-ms/pom.xml | 563 ++++++++++----------- .../src/main/docker/dockerfile/Dockerfile | 29 ++ components/slice-analysis-ms/version.properties | 2 +- 5 files changed, 316 insertions(+), 290 deletions(-) create mode 100644 components/slice-analysis-ms/src/main/docker/dockerfile/Dockerfile (limited to 'components') diff --git a/components/slice-analysis-ms/ChangeLog.md b/components/slice-analysis-ms/ChangeLog.md index 5d64d124..e09d10b2 100644 --- a/components/slice-analysis-ms/ChangeLog.md +++ b/components/slice-analysis-ms/ChangeLog.md @@ -4,8 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [1.0.6] - 2021/08/28 - - [DCAEGEN2-2885](https://jira.onap.org/browse/DCAEGEN2-2885) - DCAE SliceAnalysis MS - CPS Integration +## [1.0.7] - 2021/12/16 + - [DCAEGEN2-2963](https://jira.onap.org/browse/DCAEGEN2-2963) - Use onap/integration-java11 image - - [DCAEGEN2-2811](https://jira.onap.org/browse/DCAEGEN2-2811) - Remove security vulnerabilities +## [1.0.6] - 2021/08/28 + - [DCAEGEN2-2885](https://jira.onap.org/browse/DCAEGEN2-2885) - DCAE SliceAnalysis MS - CPS Integration + - [DCAEGEN2-2811](https://jira.onap.org/browse/DCAEGEN2-2811) - Remove security vulnerabilities diff --git a/components/slice-analysis-ms/entry.sh b/components/slice-analysis-ms/entry.sh index 2859fe93..83225b94 100644 --- a/components/slice-analysis-ms/entry.sh +++ b/components/slice-analysis-ms/entry.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh export trustpass=`cat /opt/app/sliceanalysisms/etc/cert/trust.pass` -java -Djavax.net.ssl.trustStore=/opt/app/sliceanalysisms/etc/cert/trust.jks -Djavax.net.ssl.trustStorePassword=$trustpass -jar /bin/application.jar \ No newline at end of file +java -Djavax.net.ssl.trustStore=/opt/app/sliceanalysisms/etc/cert/trust.jks -Djavax.net.ssl.trustStorePassword="$trustpass" -jar /bin/application.jar diff --git a/components/slice-analysis-ms/pom.xml b/components/slice-analysis-ms/pom.xml index 23fab21e..5fede6fe 100644 --- a/components/slice-analysis-ms/pom.xml +++ b/components/slice-analysis-ms/pom.xml @@ -4,8 +4,8 @@ * ============LICENSE_START======================================================= * slice-analysis-ms * ================================================================================ - * Copyright (C) 2020-2021 Wipro Limited. - * ============================================================================== + * Copyright (C) 2020-2021 Wipro Limited. + * ================================================================================ * 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 @@ -20,39 +20,41 @@ * ============LICENSE_END========================================================= * *******************************************************************************/ - --> - - 4.0.0 - - org.onap.oparent - oparent - 2.0.0 - - org.onap.dcaegen2.services.components - slice-analysis-ms - 1.0.6-SNAPSHOT - dcaegen2-services-slice-analysis-ms - Network slice PM analyser +--> + + + 4.0.0 + + org.onap.oparent + oparent + 2.0.0 + + org.onap.dcaegen2.services.components + slice-analysis-ms + 1.0.7-SNAPSHOT + dcaegen2-services-slice-analysis-ms + Network slice PM analyser jar - - 11 - 1.1.4 - UTF-8 - 11 - 11 - onap/${project.groupId}.${project.artifactId} - - https://nexus.onap.org - content/repositories/snapshots/ - content/repositories/releases/ - content/sites/site/org/onap/dcaegen2/services/${project.artifactId}/${project.version} - yyyyMMdd'T'HHmmss - - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - - - + + 11 + 1.1.4 + UTF-8 + 11 + 11 + onap/${project.groupId}.${project.artifactId} + + https://nexus.onap.org + content/repositories/snapshots/ + content/repositories/releases/ + content/sites/site/org/onap/dcaegen2/services/${project.artifactId}/${project.version} + yyyyMMdd'T'HHmmss + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + + + org.apache.tomcat @@ -66,30 +68,30 @@ 2.3.1.RELEASE - org.springframework - spring-webmvc - 5.3.7 - - - org.springframework - spring-core - 5.3.7 - - - org.springframework - spring-beans - 5.3.7 - - - org.springframework - spring-expression - 5.3.7 - - - org.springframework - spring-web - 5.3.7 - + org.springframework + spring-webmvc + 5.3.7 + + + org.springframework + spring-core + 5.3.7 + + + org.springframework + spring-beans + 5.3.7 + + + org.springframework + spring-expression + 5.3.7 + + + org.springframework + spring-web + 5.3.7 + org.springframework spring-tx @@ -100,234 +102,227 @@ spring-data-commons 2.2.0.RELEASE - - - org.onap.dcaegen2.services.sdk.rest.services - cbs-client - ${sdk.version} - - - org.onap.dcaegen2.services.sdk.security.crypt - crypt-password - ${sdk.version} - - - - org.springframework.boot - spring-boot-dependencies - 2.1.3.RELEASE - pom - import - - - com.att.nsa - cambriaClient - 0.0.1 - - - junit - junit - test - - - com.fasterxml.jackson.core - jackson-core - 2.11.0 - - - net.javacrumbs.json-unit - json-unit-assertj - 2.14.0 - test - - - com.fasterxml.jackson.core - jackson-databind - 2.11.0 - - - - javax.json - javax.json-api - 1.1.2 - - - org.springframework.boot - spring-boot-starter-web - 2.1.3.RELEASE - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.postgresql - postgresql - 42.2.13 - - - org.springframework.boot - spring-boot-starter-data-jpa - 2.1.3.RELEASE - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.1.Final - - - - org.springframework.boot - spring-boot-starter-test - 2.1.3.RELEASE - test - - - - - org.mockito - mockito-core - 2.21.0 - test - - - com.openpojo - openpojo - 0.8.10 - - - junit - junit - 4.12 - test - + + + org.onap.dcaegen2.services.sdk.rest.services + cbs-client + ${sdk.version} + + + org.onap.dcaegen2.services.sdk.security.crypt + crypt-password + ${sdk.version} + + + + org.springframework.boot + spring-boot-dependencies + 2.1.3.RELEASE + pom + import + + + com.att.nsa + cambriaClient + 0.0.1 + + + junit + junit + test + + + com.fasterxml.jackson.core + jackson-core + 2.11.0 + + + net.javacrumbs.json-unit + json-unit-assertj + 2.14.0 + test + + + com.fasterxml.jackson.core + jackson-databind + 2.11.0 + + + + javax.json + javax.json-api + 1.1.2 + + + org.springframework.boot + spring-boot-starter-web + 2.1.3.RELEASE + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.postgresql + postgresql + 42.2.13 + + + org.springframework.boot + spring-boot-starter-data-jpa + 2.1.3.RELEASE + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.1.Final + + + + org.springframework.boot + spring-boot-starter-test + 2.1.3.RELEASE + test + + + + + org.mockito + mockito-core + 2.21.0 + test + + + com.openpojo + openpojo + 0.8.10 + + + junit + junit + 4.12 + test + - - org.powermock - powermock-api-mockito2 - 2.0.2 - - - org.mockito - mockito-all - - - - - - org.powermock - powermock-module-junit4 - 2.0.2 - test - - - org.functionaljava - functionaljava - 3.0 - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - commons-beanutils - commons-beanutils - 1.9.4 - - - - org.eclipse.jetty - jetty-server - 9.4.41.v20210516 - - - - org.webjars - bootstrap - 4.3.1 - - - - javax.xml.bind - jaxb-api - 2.3.0 - - - - org.javassist - javassist - 3.24.1-GA - - - org.apache.tomcat.embed - tomcat-embed-core - 9.0.46 - - - - nl.jqno.equalsverifier - equalsverifier - 3.5.5 - test - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.3.1.RELEASE - - - - repackage - - - - - - com.spotify - docker-maven-plugin - - ${onap.nexus.dockerregistry.daily} - ${onap.nexus.dockerregistry.daily}/${docker.image.name} - + + org.powermock + powermock-api-mockito2 + 2.0.2 + + + org.mockito + mockito-all + + + + + + org.powermock + powermock-module-junit4 + 2.0.2 + test + + + org.functionaljava + functionaljava + 3.0 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + commons-beanutils + commons-beanutils + 1.9.4 + + + + org.eclipse.jetty + jetty-server + 9.4.41.v20210516 + + + + org.webjars + bootstrap + 4.3.1 + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + + org.javassist + javassist + 3.24.1-GA + + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.46 + + + + nl.jqno.equalsverifier + equalsverifier + 3.5.5 + test + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.3.1.RELEASE + + + + repackage + + + + + + com.spotify + docker-maven-plugin + + ${onap.nexus.dockerregistry.daily} + ${onap.nexus.dockerregistry.daily}/${docker.image.name} + ${project.version}-${maven.build.timestamp}Z ${project.version} latest - - openjdk:11.0.6-jre-slim - sliceanalysis - - - /bin - ${project.build.directory} - ${project.artifactId}-${project.version}.jar - - - /bin - ${project.basedir} - entry.sh - - - - - adduser --disabled-password sliceanalysis - mv /bin/*.jar /bin/application.jar - chmod -R 777 /bin - chmod +x /bin/entry.sh - - - 8080 - - ./bin/entry.sh - - - - + + nexus3.onap.org:10001/onap/integration-java11:10.0.0 + sliceanalysis> + ${project.basedir}/src/main/docker/dockerfile + + ${project.artifactId}-${project.version}.jar + + + + /bin + ${project.build.directory} + ${project.artifactId}-${project.version}.jar + + + /bin + ${project.basedir} + entry.sh + + + + + + diff --git a/components/slice-analysis-ms/src/main/docker/dockerfile/Dockerfile b/components/slice-analysis-ms/src/main/docker/dockerfile/Dockerfile new file mode 100644 index 00000000..fa87897c --- /dev/null +++ b/components/slice-analysis-ms/src/main/docker/dockerfile/Dockerfile @@ -0,0 +1,29 @@ +# ============LICENSE_START=================================================== +# Copyright (C) 2021 Wipro Limited +# ============================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END===================================================== + +FROM nexus3.onap.org:10001/onap/integration-java11:10.0.0 +ADD /bin/${JAR_FILE} /bin/ +ADD /bin/entry.sh /bin/ +USER root +RUN adduser sliceanalysis --disabled-password sliceanalysis +RUN mv /bin/*.jar /bin/application.jar +RUN chmod -R 777 /bin +RUN chmod +x /bin/entry.sh +USER sliceanalysis +EXPOSE 8080 +ENTRYPOINT /bin/entry.sh diff --git a/components/slice-analysis-ms/version.properties b/components/slice-analysis-ms/version.properties index 2a687c49..4434ce3b 100644 --- a/components/slice-analysis-ms/version.properties +++ b/components/slice-analysis-ms/version.properties @@ -20,7 +20,7 @@ ############################################################################### major=1 minor=0 -patch=6 +patch=7 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg