dcaegen2-services-pm-mapper incorrectly mapping the measResults

[dcaegen2/services/pm-mapper.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 516e223..8751c03 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,9 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2019-2020 Nordix Foundation.
+   Copyright (C) 2020-2022 Nokia. All rights reserved.
+   Copyright (C) 2021 Samsung Electronics. 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.
@@ -24,16 +27,17 @@
          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</groupId>
-    <artifactId>pm-mapper</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
-
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <version>3.2.0</version>
     </parent>
 
+    <groupId>org.onap.dcaegen2.services</groupId>
+    <artifactId>pm-mapper</artifactId>
+    <version>1.10.0-SNAPSHOT</version>
+
+
     <name>dcaegen2-services-pm-mapper</name>
     <description>Maps PM measurement data from XML to VES</description>
     <packaging>jar</packaging>
@@ -42,24 +46,28 @@
         <!-- Dependency Versions -->
         <lombok.version>1.18.4</lombok.version>
         <sl4j.version>1.7.25</sl4j.version>
-        <logback.version>1.2.3</logback.version>
-        <reactor.version>3.2.3.RELEASE</reactor.version>
-        <undertow.version>2.0.30.Final</undertow.version>
-        <gson.version>2.8.5</gson.version>
-        <freemarker.version>2.3.28</freemarker.version>
-        <commons.io.version>2.6</commons.io.version>
+        <logback.version>1.2.10</logback.version>
+        <reactor.version>3.4.21</reactor.version>
+        <undertow.version>2.2.17.Final</undertow.version>
+        <gson.version>2.8.9</gson.version>
+        <freemarker.version>2.3.31</freemarker.version>
+        <commons.io.version>2.8.0</commons.io.version>
         <xml.version>2.3.1</xml.version>
         <jaxb.version>2.3.0.1</jaxb.version>
+        <!-- DCAE SDK -->
+        <sdk.version>1.8.10</sdk.version>
         <!-- Testing Test Dependencies -->
         <junit.version>5.3.2</junit.version>
         <mockito.version>2.23.4</mockito.version>
         <mockito-ju5-ext.version>2.23.4</mockito-ju5-ext.version>
         <powermock.version>2.0.7</powermock.version>
-        <mockserver.version>3.10.8</mockserver.version>
+        <mockserver.version>5.11.2</mockserver.version>
         <junit4.version>4.12</junit4.version>
-        <jsonschema.version>1.3.0</jsonschema.version>
+        <jsonschema.version>1.5.1</jsonschema.version>
+        <json.version>20210307</json.version>
+        <jackson.version>2.12.2</jackson.version>
         <xerces.version>2.11.0</xerces.version>
-        <reactor.test>3.1.0.RELEASE</reactor.test>
+        <reactor.test>3.4.0</reactor.test>
         <!-- Plugin Versions -->
         <jacoco.version>0.8.2</jacoco.version>
         <surefire.version>2.22.0</surefire.version>
@@ -85,6 +93,10 @@
         <pmmapper.main.class>org.onap.dcaegen2.services.pmmapper.App</pmmapper.main.class>
         <dep.dir.name>libs</dep.dir.name>
         <ext.dep.dir.path>${dep.dir.name}/external</ext.dep.dir.path>
+
+        <docker-image.tag.latest>latest</docker-image.tag.latest>
+        <!--Skip gerrit review rules-->
+        <onap-gerrit-review>-missing-package-json</onap-gerrit-review>
     </properties>
 
     <dependencies>
@@ -114,6 +126,16 @@
             <artifactId>jaxb-core</artifactId>
             <version>${jaxb.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
+            <artifactId>dmaap-client</artifactId>
+            <version>${sdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
+            <artifactId>cbs-client</artifactId>
+            <version>${sdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -167,7 +189,6 @@
             <version>${mockito-ju5-ext.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -197,6 +218,12 @@
             <artifactId>mockserver-netty</artifactId>
             <version>${mockserver.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>*</artifactId>
+                    <groupId>io.netty</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
@@ -204,6 +231,18 @@
             <version>${mockserver.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>${json.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
@@ -305,7 +344,7 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>onap/${project.groupId}.${project.artifactId}</name>
+                            <name>onap/${project.groupId}.${project.artifactId}:${docker-image.tag.latest}</name>
                             <registry>${onap.nexus.dockerregistry.daily}</registry>
                             <build>
                                 <contextDir>${project.basedir}</contextDir>