[DCAEGEN2] Vulnerability addressal for TCAgen21.3.2-tca-gen2

Issue-ID: DCAEGEN2-3042
Signed-off-by: denilson.l65 <denilson.l65@wipro.com>
Change-Id: I19dbbca5b985f582b1c4201fc2abf55295a56c59

10 files changed, 62 insertions, 43 deletions

diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml
index 69f21d3..4a0b64a 100644
--- a/dcae-analytics/dcae-analytics-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-model/pom.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~ TCAgen2
   ~ ================================================================================
   ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
+  ~ Copyright (c) 2022 Wipro Limited.
   ~ ================================================================================
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -28,7 +31,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>dcae-analytics-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml
index cdc75d1..d21a86c 100644
--- a/dcae-analytics/dcae-analytics-tca-core/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~ TCAgen2
   ~ ================================================================================
   ~ Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
+  ~ Copyright (c) 2022 Wipro Limited.
   ~ ================================================================================
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -28,7 +31,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>${revision}</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 92bd50f..488d1c8 100644
--- a/dcae-analytics/dcae-analytics-tca-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~ TCAgen2
   ~ ================================================================================
   ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
+  ~ Copyright (c) 2022 Wipro Limited.
   ~ ================================================================================
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -28,7 +31,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>${revision}</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 0a1b994..fc7ccaa 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~ TCAgen2
   ~ ================================================================================
   ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+  ~ Copyright (c) 2019 IBM.
   ~ 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
+  ~ Copyright (c) 2021-2022 Wipro Limited.
   ~ ================================================================================
   ~ 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 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-web</artifactId>
@@ -43,9 +44,9 @@
     <description>Contains Web related code for TCA</description>
 
     <properties>
-	    <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>
+            <main.basedir>${project.parent.basedir}</main.basedir>
+            <undertow-core.version>2.2.14.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>
 
@@ -69,7 +70,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>io.undertow</groupId>
-		    <artifactId>undertow-core</artifactId>
+                    <artifactId>undertow-core</artifactId>
               </exclusion>
             </exclusions>
         </dependency>
@@ -125,8 +126,8 @@
         <!-- https://mvnrepository.com/artifact/io.undertow/undertow-core -->
         <dependency>
             <groupId>io.undertow</groupId>
-	    <artifactId>undertow-core</artifactId>
-	    <version>${undertow-core.version}</version>
+            <artifactId>undertow-core</artifactId>
+            <version>${undertow-core.version}</version>
         </dependency>
 
     </dependencies>
@@ -178,8 +179,8 @@
                    <id>tag-version</id>
                    <phase>install</phase>
                    <goals>
-                      <goal>tag</goal>
-                      <goal>push</goal>
+                        <goal>tag</goal>
+                        <goal>push</goal>
                    </goals>
                         <configuration>
                               <tag>${project.version}</tag>
@@ -189,8 +190,8 @@
                                <id>tag-version-ts</id>
                                <phase>install</phase>
                                <goals>
-                                      <goal>tag</goal>
-                                      <goal>push</goal>
+                                   <goal>tag</goal>
+                                   <goal>push</goal>
                                </goals>
                                 <configuration>
                               <tag>${project.version}-${maven.build.timestamp}Z</tag>
diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index d61f9be..ea2ca88 100644
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/pom.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~  TCAgen2
   ~ ================================================================================
   ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
+  ~ Copyright (c) 2022 Wipro Limited.
   ~ ================================================================================
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -28,7 +31,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>dcae-analytics-test</artifactId>
@@ -65,11 +68,11 @@
                     <groupId>org.junit.vintage</groupId>
                     <artifactId>junit-vintage-engine</artifactId>
                 </exclusion>
-			    <exclusion>
-			      <groupId>org.mockito</groupId>
-			      <artifactId>mockito-core</artifactId>
-			    </exclusion>
-                </exclusions>
+                <exclusion>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- JSON SERIALIZATION/DESERIALIZATION LIBRARY -->
diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml
index 5d79faf..6244dea 100644
--- a/dcae-analytics/dcae-analytics-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-web/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~ TCAgen2
   ~ ================================================================================
   ~ 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.
+  ~ Copyright (c) 2021-2022 Wipro Limited.
   ~ ================================================================================
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -30,7 +32,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>dcae-analytics-web</artifactId>
@@ -41,12 +43,11 @@
     <description>Contains common web code for all DCAE Analytics Modules</description>
 
     <properties>
-	    <main.basedir>${project.parent.basedir}</main.basedir>
-	    <undertow-core.version>2.2.7.Final</undertow-core.version>
-	    <httpclient.version>4.5.13</httpclient.version>
+            <main.basedir>${project.parent.basedir}</main.basedir>
+            <undertow-core.version>2.2.14.Final</undertow-core.version>
+            <httpclient.version>4.5.13</httpclient.version>
     </properties>
 
-
     <dependencies>
 
         <!-- PROJECT DEPENDENCIES -->
@@ -74,11 +75,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>
@@ -89,7 +90,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>io.undertow</groupId>
-		    <artifactId>undertow-websockets-jsr</artifactId>
+                    <artifactId>undertow-websockets-jsr</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -116,8 +117,8 @@
         <!-- APACHE HTTP CLIENT -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-	    <artifactId>httpclient</artifactId>
-	    <version>${httpclient.version}</version>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
         </dependency>
 
         <!-- UTILITIES -->
@@ -151,8 +152,8 @@
          <!-- https://mvnrepository.com/artifact/io.undertow/undertow-core -->
         <dependency>
             <groupId>io.undertow</groupId>
-	    <artifactId>undertow-core</artifactId>
-	    <version>${undertow-core.version}</version>
+            <artifactId>undertow-core</artifactId>
+            <version>${undertow-core.version}</version>
         </dependency>
 
     </dependencies>
diff --git a/dcae-analytics/dpo/tcagen2-componentspec-v3-policy.json b/dcae-analytics/dpo/tcagen2-componentspec-v3-policy.json
index a0bd636..6861123 100644
--- a/dcae-analytics/dpo/tcagen2-componentspec-v3-policy.json
+++ b/dcae-analytics/dpo/tcagen2-componentspec-v3-policy.json
@@ -1,7 +1,7 @@
 {
   "self": {
     "name": "dcae-tcagen2",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "description": "TCAGen2 Docker Application",
     "component_type": "docker"
   },
@@ -73,7 +73,7 @@
   },
   "artifacts": [
     {
-      "uri": "onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.1",
+      "uri": "onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.2",
       "type": "docker image"
     }
   ],
diff --git a/dcae-analytics/dpo/tcagen2-componentspec-v3.json b/dcae-analytics/dpo/tcagen2-componentspec-v3.json
index 0f2853e..8220466 100644
--- a/dcae-analytics/dpo/tcagen2-componentspec-v3.json
+++ b/dcae-analytics/dpo/tcagen2-componentspec-v3.json
@@ -1,7 +1,7 @@
 {
   "self": {
     "name": "dcae-tcagen2",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "description": "TCAGen2 Docker Application",
     "component_type": "docker"
   },
@@ -73,7 +73,7 @@
   },
   "artifacts": [
     {
-      "uri": "onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.1",
+      "uri": "onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.2",
       "type": "docker image"
     }
   ],
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index 01f3c3d..ce7521e 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~ TCAgen2
   ~ ================================================================================
   ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
   ~ Copyright (c) 2021 China Mobile Property. All rights reserved.
+  ~ Copyright (c) 2022 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 +32,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>tca-gen2-parent</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>dcae-analytics</artifactId>
diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties
index 33359df..168bd06 100644
--- a/dcae-analytics/version.properties
+++ b/dcae-analytics/version.properties
@@ -1,7 +1,9 @@
-#
+# ============LICENSE_START=======================================================
+# TCAgen2
 # ================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2021 Samsung Electronics. All rights reserved.
+# Copyright (c) 2022 Wipro Limited.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +21,7 @@
 #
 major=1
 minor=3
-patch=1
+patch=2
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT