From b28d09d2e9a97994b0aa93c5632ebaf1f80cee41 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 3 Jan 2022 14:17:00 -0500 Subject: Upgrade to log4j2 2.17.1 Update to use version 2.17.1 to resolve log4shell vulnerability Issue-ID: CCSDK-3556 Signed-off-by: Dan Timoney Change-Id: I5fff58c7cc59f4a95156fb0180a2d8aa070d4b30 --- ms/neng/pom.xml | 587 +++++++++++++-------------- ms/neng/src/main/compose/docker-compose.yaml | 2 +- ms/pom.xml | 1 - ms/sliboot/pom.xml | 10 +- ms/sliboot/src/main/dc/docker-compose.yaml | 2 +- ms/vlantag-api/pom.xml | 18 +- pom.xml | 27 +- services/pom.xml | 8 +- 8 files changed, 319 insertions(+), 336 deletions(-) diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 4a40ad17..9c3ee6f3 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -18,15 +18,27 @@ * limitations under the License. * ============LICENSE_END========================================================= --> - 4.0.0 + + org.onap.ccsdk.apps + ccsdk-apps-ms + 1.3.0-SNAPSHOT + + org.onap.ccsdk.apps ccsdk-apps-ms-neng 1.3.0-SNAPSHOT + Naming Generation + + + ${userId} + + + ${basedir}/target/classes/META-INF/resources/swagger service.json @@ -56,191 +68,6 @@ ${maven.build.timestamp} - - - all-tests - - all-tests - false - false - - - - dev - - - integration-test - - integration-test - false - true - - - - - blackduck - - - blackduck-scan - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - - - - docker - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - startService.sh - Dockerfile - - true - - - - - - copy-app-jar - - copy-resources - - package - - ${basedir}/target/docker-stage - - - ${basedir}/target/ - - NetworkElementNameGen.jar - - false - - - - - - copy-config - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/etc/config - - - ${basedir}/opt/etc/config - - * - - true - - - - - - - - - - io.fabric8 - docker-maven-plugin - 0.28.0 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - - - - - true - - - - generate-images - package - - build - - - - push-images - ${docker.push.phase} - - build - push - - - - - - - - - - - - - ${userId} - - - - - - org.onap.ccsdk.parent - spring-boot-25-starter-parent - 2.3.0 - - - - - io.swagger @@ -364,116 +191,22 @@ NetworkElementNameGen - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - execute - - - ${basedir}/../../TagVersion.groovy - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${surefireArgLine} - ${skip.unit.tests} - - **/IT*.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-tests - - integration-test - verify - - - ${failsafeArgLine} - ${skip.integration.tests} - - - - - - maven-dependency-plugin - - - com.github.kongchen - swagger-maven-plugin - 3.1.3 - - - - org.onap.ccsdk.apps.ms.neng.service.rs - /web - - ${project.artifactId} Service - ${project.version} - - ${swagger.directory} - - - - - - package - - generate - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - src/main/resources - true - - **/* - - - - opt/aai/keystore - ../opt/aai/keystore - false - - **/* - - + + + src/main/resources + true + + **/* + + + + opt/aai/keystore + ../opt/aai/keystore + false + + **/* + + opt/etc/config @@ -556,5 +289,267 @@ + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../../TagVersion.groovy + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefireArgLine} + ${skip.unit.tests} + + **/IT*.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-tests + + integration-test + verify + + + ${failsafeArgLine} + ${skip.integration.tests} + + + + + + maven-dependency-plugin + + + com.github.kongchen + swagger-maven-plugin + 3.1.3 + + + + org.onap.ccsdk.apps.ms.neng.service.rs + /web + + ${project.artifactId} Service + ${project.version} + + ${swagger.directory} + + + + + + package + + generate + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + all-tests + + all-tests + false + false + + + + dev + + + integration-test + + integration-test + false + true + + + + + blackduck + + + blackduck-scan + + + + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + + + + + + docker + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + startService.sh + Dockerfile + + true + + + + + + copy-app-jar + + copy-resources + + package + + ${basedir}/target/docker-stage + + + ${basedir}/target/ + + NetworkElementNameGen.jar + + false + + + + + + copy-config + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/etc/config + + + ${basedir}/opt/etc/config + + * + + true + + + + + + + + + + io.fabric8 + docker-maven-plugin + 0.28.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + true + + + + generate-images + package + + build + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + diff --git a/ms/neng/src/main/compose/docker-compose.yaml b/ms/neng/src/main/compose/docker-compose.yaml index 2a9f373c..63c5d230 100644 --- a/ms/neng/src/main/compose/docker-compose.yaml +++ b/ms/neng/src/main/compose/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2.1' services: nengdb: - image: mariadb:10.5 + image: mariadb:latest container_name: nengdb ports: - "${NENG_DB_PORT}:3306" diff --git a/ms/pom.xml b/ms/pom.xml index 7912d7c0..5eefe802 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -18,7 +18,6 @@ * limitations under the License. * ============LICENSE_END========================================================= --> - 4.0.0 diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml index 3a7f15c8..94120bb9 100644 --- a/ms/sliboot/pom.xml +++ b/ms/sliboot/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - spring-boot-25-starter-parent - 2.3.0 - + org.onap.ccsdk.apps + ccsdk-apps-ms + 1.3.0-SNAPSHOT org.onap.ccsdk.apps @@ -236,7 +235,6 @@ org.apache.maven.plugins maven-dependency-plugin 2.10 - copy-sliapi-model-swagger @@ -519,7 +517,7 @@ - mariadb:10.5 + mariadb:latest slibootdb diff --git a/ms/sliboot/src/main/dc/docker-compose.yaml b/ms/sliboot/src/main/dc/docker-compose.yaml index a6bd9b5a..7a98fcdd 100755 --- a/ms/sliboot/src/main/dc/docker-compose.yaml +++ b/ms/sliboot/src/main/dc/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2.1' services: db: - image: mariadb:10.5 + image: mariadb:latest container_name: sliboot_db_container ports: - "13306:3306" diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml index ca4797d4..9f20d4d5 100644 --- a/ms/vlantag-api/pom.xml +++ b/ms/vlantag-api/pom.xml @@ -2,6 +2,12 @@ 4.0.0 + + org.onap.ccsdk.apps + ccsdk-apps-ms + 1.3.0-SNAPSHOT + + org.onap.ccsdk.apps.ms.vlantagapi vlantag-api 1.3.0-SNAPSHOT @@ -30,14 +36,6 @@ 1.1.1 - - org.onap.ccsdk.parent - spring-boot-25-starter-parent - 2.3.0 - - - - org.springframework.boot @@ -98,8 +96,6 @@ - - @@ -243,6 +239,4 @@ - - diff --git a/pom.xml b/pom.xml index a9dfa749..6b2b168d 100755 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.3.0 + spring-boot-25-starter-parent + 2.3.2 @@ -21,6 +21,17 @@ ONAP + + services + ms + + + + scm:git:ssh://git@${onap.git.host}/apps.git + scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/apps.git + ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/apps/browse + + @@ -40,11 +51,6 @@ 0.8.3 - - services - ms - - @@ -55,12 +61,6 @@ - - scm:git:ssh://git@${onap.git.host}/apps.git - scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/apps.git - ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/apps/browse - - blackduck @@ -137,5 +137,4 @@ - diff --git a/services/pom.xml b/services/pom.xml index 64f55cfe..730e2731 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - spring-boot-25-starter-parent - 2.3.0 - + org.onap.ccsdk.apps + ccsdk-apps + 1.3.0-SNAPSHOT org.onap.ccsdk.apps @@ -157,5 +156,4 @@ test - -- cgit 1.2.3-korg