aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xChangelog.md3
-rw-r--r--UniversalVesAdapter/.classpath13
-rw-r--r--UniversalVesAdapter/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--UniversalVesAdapter/.settings/org.eclipse.jdt.core.prefs9
-rwxr-xr-xUniversalVesAdapter/pom.xml11
-rwxr-xr-xpom.xml3
-rw-r--r--snmpmapper/Changelog.md8
-rw-r--r--snmpmapper/pom.xml326
-rwxr-xr-xversion.properties4
9 files changed, 204 insertions, 174 deletions
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 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@@ -32,10 +33,16 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/classes" path="src/gen/java">
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
- <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
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/<project>=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 @@
<groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>
<artifactId>UniversalVesAdapter</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<parent>
<groupId>org.onap.dcaegen2.services.mapper</groupId>
<artifactId>mapper</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<properties>
@@ -53,7 +54,7 @@
content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}
</site.path>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
- <jackson.core.version>2.13.3</jackson.core.version>
+ <jackson.core.version>2.14.1</jackson.core.version>
<!-- DCAE SDK version -->
<sdk.version>1.8.10</sdk.version>
@@ -166,7 +167,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.3.6</version>
+ <version>42.5.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -277,7 +278,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
- <version>0.9.12.RELEASE</version>
+ <version>1.1.0</version>
</dependency>
</dependencies>
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 @@
<groupId>org.onap.dcaegen2.services.mapper</groupId>
<artifactId>mapper</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>dcaegen2-services-mapper</name>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- * ============LICENSE_START=======================================================
- * ONAP : DCAEGEN2/services/mapper * ================================================================================
- * Copyright 2018 TechMahindra *=================================================================================
- * 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.
- * ============LICENSE_END========================================================= -->
+<!--
+* ============LICENSE_START=======================================================
+* ONAP : DCAEGEN2/services/mapper
+* ================================================================================
+* Copyright 2018 TechMahindra
+* 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.
+* 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.
+* ============LICENSE_END=========================================================
+ -->
<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>
+ 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.dcaegen2.services.mapper</groupId>
- <artifactId>snmpmapper</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <groupId>org.onap.dcaegen2.services.mapper</groupId>
+ <artifactId>snmpmapper</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>snmpmapper</name>
- <description>saves mapping file to potsgresql database</description>
+ <name>snmpmapper</name>
+ <description>saves mapping file to potsgresql database</description>
- <parent>
- <groupId>org.onap.dcaegen2.services.mapper</groupId>
- <artifactId>mapper</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.dcaegen2.services.mapper</groupId>
+ <artifactId>mapper</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>8</java.version>
-
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>11</java.version>
+
+
+ <docker.image.name>onap/org.onap.dcaegen2.services.mapper.snmpmapper</docker.image.name>
- <docker.image.name>onap/org.onap.dcaegen2.services.mapper.snmpmapper</docker.image.name>
-
<!-- TEST SETTINGS -->
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
-
+
<!-- PLUGIN SETTINGS -->
<dependency.locations.enabled>false</dependency.locations.enabled>
-
+
<!-- NEXUS RELATED SETTINGS -->
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshots.path>content/repositories/snapshots/</snapshots.path>
@@ -50,127 +56,127 @@
content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}
</site.path>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
- </properties>
- <dependencies>
-<!-- <dependency>
- <groupId>org.springframework.webflow</groupId>
- <artifactId>spring-webflow</artifactId>
- <version>2.5.0.RELEASE</version>
- </dependency> -->
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- <version>2.1.1.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>2.1.1.RELEASE</version>
- </dependency>
+ </properties>
+ <dependencies>
+<!-- <dependency>
+ <groupId>org.springframework.webflow</groupId>
+ <artifactId>spring-webflow</artifactId>
+ <version>2.5.0.RELEASE</version>
+ </dependency> -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <version>2.1.1.RELEASE</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>2.1.1.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>5.1.3.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>5.1.3.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <scope>runtime</scope>
- <version>42.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>5.1.3.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>3.0-alpha-1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.2</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ <version>2.1.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>2.1.1.RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <version>2.1.1.RELEASE</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>2.1.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>5.1.3.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>5.1.3.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>runtime</scope>
+ <version>42.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>5.1.3.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>3.0-alpha-1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
-
- </dependencies>
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>1.0.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.1.1.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.1.1.RELEASE</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- <configuration>
- <mainClass>org.onap.dcaegen2.services.mapper.snmpmapper.SnmpmapperApplication</mainClass>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build-Version>${project.version}</Implementation-Build-Version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
-
+ </dependencies>
+
+ <build>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.1.1.RELEASE</version>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.1.1.RELEASE</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.onap.dcaegen2.services.mapper.snmpmapper.SnmpmapperApplication</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build-Version>${project.version}</Implementation-Build-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
@@ -190,10 +196,10 @@
</execution>
</executions>
</plugin>
-
- <!-- Spotify plugin to build and push docker image -->
- <plugin>
+ <!-- Spotify plugin to build and push docker image -->
+
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
@@ -203,13 +209,13 @@
<imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>
<imageTags>
<tag>latest</tag>
- <tag>${project.version}-${maven.build.timestamp}Z</tag>
- <tag>${project.version}</tag>
+ <tag>${project.version}-${maven.build.timestamp}Z</tag>
+ <tag>${project.version}</tag>
</imageTags>
<baseImage>ubuntu:16.04</baseImage>
<env>
<HOSTALIASES>/etc/host.aliases</HOSTALIASES>
- <HOME>/opt/app/SnmpMapper</HOME>
+ <HOME>/opt/app/SnmpMapper</HOME>
</env>
<workdir>/opt/app/SnmpMapper</workdir>
<resources>
@@ -303,12 +309,12 @@
<failIfNoMatch>false</failIfNoMatch> </configuration> </execution> -->
</executions>
</plugin>
-
- </plugins>
- <!-- <finalName>snmpmapper</finalName> -->
- </build>
-
-
+
+ </plugins>
+ <!-- <finalName>snmpmapper</finalName> -->
+ </build>
+
+
<profiles>
<profile>
<id>with-system-proxy</id>
@@ -345,4 +351,4 @@
</pluginRepositories>
-</project> \ No newline at end of file
+</project>
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