Merge "Add AaiSerializer"

diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml
index ff8382d..69f21d3 100644 (file)
--- a/dcae-analytics/dcae-analytics-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-model/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-model</artifactId>
@@ -42,7 +42,7 @@
 
     <properties>
         <main.basedir>${project.parent.basedir}</main.basedir>
-        <sdk.version>1.5.0</sdk.version>
+        <sdk.version>1.8.6</sdk.version>
         <immutable.version>2.7.1</immutable.version>
     </properties>
 

diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml
index f7393ac..cdc75d1 100644 (file)
--- a/dcae-analytics/dcae-analytics-tca-core/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-core</artifactId>

diff --git a/dcae-analytics/dcae-analytics-tca-model/pom.xml b/dcae-analytics/dcae-analytics-tca-model/pom.xml
index 076125d..92bd50f 100644 (file)
--- a/dcae-analytics/dcae-analytics-tca-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-model</artifactId>

diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 7c81f4f..0a1b994 100644 (file)
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -4,6 +4,7 @@
   ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
   ~ Copyright (c) 2021 Nokia Intellectual Property. All rights reserved.
+  ~ Copyright (c) 2021 Wipro Limited.
   ~ ================================================================================
   ~ Modifications Copyright (C) 2019 IBM
   ~ ================================================================================
@@ -31,7 +32,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-web</artifactId>
@@ -42,8 +43,9 @@
     <description>Contains Web related code for TCA</description>
 
     <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-        <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
+           <main.basedir>${project.parent.basedir}</main.basedir>
+           <undertow-core.version>2.2.7.Final</undertow-core.version>
+           <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
     </properties>
 
@@ -67,7 +69,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>io.undertow</groupId>
-                    <artifactId>undertow-core</artifactId>
+                   <artifactId>undertow-core</artifactId>
               </exclusion>
             </exclusions>
         </dependency>
@@ -123,7 +125,8 @@
         <!-- https://mvnrepository.com/artifact/io.undertow/undertow-core -->
         <dependency>
             <groupId>io.undertow</groupId>
-            <artifactId>undertow-core</artifactId>
+           <artifactId>undertow-core</artifactId>
+           <version>${undertow-core.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index 5102cc6..d61f9be 100644 (file)
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-test</artifactId>

diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml
index 856a8ed..5d79faf 100644 (file)
--- a/dcae-analytics/dcae-analytics-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-web/pom.xml
@@ -4,6 +4,7 @@
   ~ Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
   ~ Copyright (c) 2021 Nokia Intellectual Property. All rights reserved.
+  ~ 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.
@@ -29,7 +30,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-web</artifactId>
@@ -40,7 +41,9 @@
     <description>Contains common web code for all DCAE Analytics Modules</description>
 
     <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
+           <main.basedir>${project.parent.basedir}</main.basedir>
+           <undertow-core.version>2.2.7.Final</undertow-core.version>
+           <httpclient.version>4.5.13</httpclient.version>
     </properties>
 
 
@@ -71,11 +74,11 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                   <artifactId>spring-boot-starter-tomcat</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>io.undertow</groupId>
-                    <artifactId>undertow-core</artifactId>
+                   <artifactId>undertow-core</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -86,7 +89,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>io.undertow</groupId>
-                    <artifactId>undertow-websockets-jsr</artifactId>
+                   <artifactId>undertow-websockets-jsr</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -113,7 +116,8 @@
         <!-- APACHE HTTP CLIENT -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+           <artifactId>httpclient</artifactId>
+           <version>${httpclient.version}</version>
         </dependency>
 
         <!-- UTILITIES -->
@@ -147,7 +151,8 @@
          <!-- https://mvnrepository.com/artifact/io.undertow/undertow-core -->
         <dependency>
             <groupId>io.undertow</groupId>
-            <artifactId>undertow-core</artifactId>
+           <artifactId>undertow-core</artifactId>
+           <version>${undertow-core.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index d3d924f..01f3c3d 100644 (file)
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>tca-gen2-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics</artifactId>

diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties
index b1893d0..33359df 100644 (file)
--- a/dcae-analytics/version.properties
+++ b/dcae-analytics/version.properties
@@ -19,7 +19,7 @@
 #
 major=1
 minor=3
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT

diff --git a/eelf-logger/eelf-logger-api/pom.xml b/eelf-logger/eelf-logger-api/pom.xml
index 00fa5cb..6ed8ddd 100644 (file)
--- a/eelf-logger/eelf-logger-api/pom.xml
+++ b/eelf-logger/eelf-logger-api/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-api</artifactId>

diff --git a/eelf-logger/eelf-logger-logback-impl/pom.xml b/eelf-logger/eelf-logger-logback-impl/pom.xml
index 399077d..e427e9f 100644 (file)
--- a/eelf-logger/eelf-logger-logback-impl/pom.xml
+++ b/eelf-logger/eelf-logger-logback-impl/pom.xml
@@ -28,7 +28,7 @@
     <parent>
                <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-logback-impl</artifactId>

diff --git a/eelf-logger/eelf-logger-model/pom.xml b/eelf-logger/eelf-logger-model/pom.xml
index 8458548..5eaff67 100644 (file)
--- a/eelf-logger/eelf-logger-model/pom.xml
+++ b/eelf-logger/eelf-logger-model/pom.xml
@@ -28,7 +28,7 @@
     <parent>
                <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-model</artifactId>

diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml
index 472a715..11ed323 100644 (file)
--- a/eelf-logger/pom.xml
+++ b/eelf-logger/pom.xml
@@ -27,7 +27,7 @@
        <parent>
                <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
                <artifactId>tca-gen2-parent</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.3.1-SNAPSHOT</version>
        </parent>
 
     <artifactId>eelf-logger</artifactId>

diff --git a/pom.xml b/pom.xml
index e610942..60f6655 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
     <artifactId>tca-gen2-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
 
     <name>dcaegen2-analytics-tca-gen2</name>
     <packaging>pom</packaging>

diff --git a/version.properties b/version.properties
index 7d6815b..fee4928 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=3
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT