From 0aa02aaafa1ee8be3bbe66b421be5d80c73e421b Mon Sep 17 00:00:00 2001 From: sushant53 Date: Fri, 3 Feb 2023 15:40:45 +0530 Subject: [DCAEGEN2] Upgrade dependencies for dcaegen2-services-mapper Upgrade dependency version as per SECCOM recommendations. Issue-ID: DCAEGEN2-3343 Change-Id: Iac0aee8b150797e36801e8f9f6b09d2005c362d7 Signed-off-by: sushant53 [DCAEGEN2] Upgrade dependencies for dcaegen2-services-mapper Included Changelog.md file. Issue-ID: DCAEGEN2-3343 Change-Id: Iac0aee8b150797e36801e8f9f6b09d2005c362d7 Signed-off-by: sushant53 [DCAEGEN2] Upgrade dependencies for dcaegen2-services-mapper Corrected tabbed-indentation in snmpmapper/pom.xml file Issue-ID: DCAEGEN2-3343 Change-Id: Iac0aee8b150797e36801e8f9f6b09d2005c362d7 Signed-off-by: sushant53 --- Changelog.md | 3 + UniversalVesAdapter/.classpath | 13 +- .../.settings/org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 9 +- UniversalVesAdapter/pom.xml | 11 +- pom.xml | 3 +- snmpmapper/Changelog.md | 8 + snmpmapper/pom.xml | 326 +++++++++++---------- version.properties | 4 +- 9 files changed, 204 insertions(+), 174 deletions(-) create mode 100644 snmpmapper/Changelog.md diff --git a/Changelog.md b/Changelog.md index 53fc15e..7d83be9 100755 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,9 @@ 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.5.0] - 2023/02/03 + - [DCAEGEN2-3343] - dcaegen2-services-mapper vulnerability updates + ## [1.4.3] - 2022/09/23 - [DCAEGEN2-3217] - dcaegen2-services-mapper vulnerability updates - [DCAEGEN2-3269] - Fix application startup error + SDK version bump diff --git a/UniversalVesAdapter/.classpath b/UniversalVesAdapter/.classpath index 1301883..7e8a125 100644 --- a/UniversalVesAdapter/.classpath +++ b/UniversalVesAdapter/.classpath @@ -15,9 +15,10 @@ + - + @@ -32,10 +33,16 @@ - + - + + + + + + + diff --git a/UniversalVesAdapter/.settings/org.eclipse.core.resources.prefs b/UniversalVesAdapter/.settings/org.eclipse.core.resources.prefs index 839d647..29abf99 100644 --- a/UniversalVesAdapter/.settings/org.eclipse.core.resources.prefs +++ b/UniversalVesAdapter/.settings/org.eclipse.core.resources.prefs @@ -2,4 +2,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/UniversalVesAdapter/.settings/org.eclipse.jdt.core.prefs b/UniversalVesAdapter/.settings/org.eclipse.jdt.core.prefs index 78b2bfc..2985089 100644 --- a/UniversalVesAdapter/.settings/org.eclipse.jdt.core.prefs +++ b/UniversalVesAdapter/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=enabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml index 24864cd..1a6af9c 100755 --- a/UniversalVesAdapter/pom.xml +++ b/UniversalVesAdapter/pom.xml @@ -6,6 +6,7 @@ * Copyright 2018-2019 TechMahindra * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. * Copyright (c) 2021-2022 AT&T Intellectual Property. All rights reserved. +* Copyright (C) 2023 Deutsche Telekom AG. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,11 +29,11 @@ org.onap.dcaegen2.services.mapper.vesadapter UniversalVesAdapter - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.mapper mapper - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT @@ -53,7 +54,7 @@ content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version} yyyyMMdd'T'HHmmss - 2.13.3 + 2.14.1 1.8.10 @@ -166,7 +167,7 @@ org.postgresql postgresql - 42.3.6 + 42.5.1 org.springframework @@ -277,7 +278,7 @@ io.projectreactor.netty reactor-netty - 0.9.12.RELEASE + 1.1.0 diff --git a/pom.xml b/pom.xml index 18af8ed..e52d1a2 100755 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,7 @@ * Copyright 2018-2019 TechMahindra * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. * Copyright (c) 2021-2022 AT&T Intellectual Property. All rights reserved. +* Copyright (C) 2023 Deutsche Telekom AG. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +33,7 @@ org.onap.dcaegen2.services.mapper mapper - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT pom dcaegen2-services-mapper diff --git a/snmpmapper/Changelog.md b/snmpmapper/Changelog.md new file mode 100644 index 0000000..2985ef5 --- /dev/null +++ b/snmpmapper/Changelog.md @@ -0,0 +1,8 @@ +# Change Log +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/). + +## [0.1.0] - 2023/02/03 + - [DCAEGEN2-3343] - Added Changelog.md file diff --git a/snmpmapper/pom.xml b/snmpmapper/pom.xml index b5796f3..413615a 100644 --- a/snmpmapper/pom.xml +++ b/snmpmapper/pom.xml @@ -1,47 +1,53 @@ - + - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.onap.dcaegen2.services.mapper - snmpmapper - 0.0.1-SNAPSHOT - jar + org.onap.dcaegen2.services.mapper + snmpmapper + 0.1.0-SNAPSHOT + jar - snmpmapper - saves mapping file to potsgresql database + snmpmapper + saves mapping file to potsgresql database - - org.onap.dcaegen2.services.mapper - mapper - 0.0.1-SNAPSHOT - + + org.onap.dcaegen2.services.mapper + mapper + 1.5.0-SNAPSHOT + - - UTF-8 - UTF-8 - 8 - + + UTF-8 + UTF-8 + 11 + + + onap/org.onap.dcaegen2.services.mapper.snmpmapper - onap/org.onap.dcaegen2.services.mapper.snmpmapper - true - + false - + https://nexus.onap.org content/repositories/snapshots/ @@ -50,127 +56,127 @@ content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version} yyyyMMdd'T'HHmmss - - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - 2.1.1.RELEASE - - - org.springframework.boot - spring-boot-starter-web - 2.1.1.RELEASE - + + + - - org.springframework.boot - spring-boot-starter-test - 2.1.1.RELEASE - test - - - org.springframework.boot - spring-boot-starter-data-jpa - 2.1.1.RELEASE - - - org.springframework - spring-core - 5.1.3.RELEASE - - - org.springframework - spring-expression - 5.1.3.RELEASE - - - org.postgresql - postgresql - runtime - 42.2.5 - - - org.springframework - spring-jdbc - 5.1.3.RELEASE - - - javax.servlet - servlet-api - 3.0-alpha-1 - - - javax.servlet.jsp - jsp-api - 2.2 - - + + org.springframework.boot + spring-boot-starter-thymeleaf + 2.1.1.RELEASE + + + org.springframework.boot + spring-boot-starter-web + 2.1.1.RELEASE + + + + org.springframework.boot + spring-boot-starter-test + 2.1.1.RELEASE + test + + + org.springframework.boot + spring-boot-starter-data-jpa + 2.1.1.RELEASE + + + org.springframework + spring-core + 5.1.3.RELEASE + + + org.springframework + spring-expression + 5.1.3.RELEASE + + + org.postgresql + postgresql + runtime + 42.5.1 + + + org.springframework + spring-jdbc + 5.1.3.RELEASE + + + javax.servlet + servlet-api + 3.0-alpha-1 + + + javax.servlet.jsp + jsp-api + 2.2 + + commons-fileupload commons-fileupload 1.3.3 - - - - - - - - maven-assembly-plugin - 3.1.0 - - - com.spotify - docker-maven-plugin - 1.0.0 - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.1.1.RELEASE - - - org.springframework.boot - spring-boot-maven-plugin - 2.1.1.RELEASE - - - - repackage - - - org.onap.dcaegen2.services.mapper.snmpmapper.SnmpmapperApplication - - - - - - maven-jar-plugin - - - - true - - - ${project.version} - - - - - - + + + + + + + + maven-assembly-plugin + 3.1.0 + + + com.spotify + docker-maven-plugin + 1.0.0 + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.1.1.RELEASE + + + org.springframework.boot + spring-boot-maven-plugin + 2.1.1.RELEASE + + + + repackage + + + org.onap.dcaegen2.services.mapper.snmpmapper.SnmpmapperApplication + + + + + + maven-jar-plugin + + + + true + + + ${project.version} + + + + + + maven-assembly-plugin @@ -190,10 +196,10 @@ - - - + + + com.spotify docker-maven-plugin 1.0.0 @@ -203,13 +209,13 @@ ${onap.nexus.dockerregistry.daily}/${docker.image.name} latest - ${project.version}-${maven.build.timestamp}Z - ${project.version} + ${project.version}-${maven.build.timestamp}Z + ${project.version} ubuntu:16.04 /etc/host.aliases - /opt/app/SnmpMapper + /opt/app/SnmpMapper /opt/app/SnmpMapper @@ -303,12 +309,12 @@ false --> - - - - - - + + + + + + with-system-proxy @@ -345,4 +351,4 @@ - \ No newline at end of file + diff --git a/version.properties b/version.properties index 69a4fe1..3749e87 100755 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 -minor=4 -patch=3 +minor=5 +patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg