From 1d2daa763efd7c1fb55c85f040b152fe68d1d1a1 Mon Sep 17 00:00:00 2001
From: Kai <lukai@chinamobile.com>
Date: Thu, 18 Feb 2021 14:14:04 +0800
Subject: Vulnerability removal for TCAgen2

Issue-ID: DCAEGEN2-2590
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I9463568c694255a1eab418051d05083e01a7cb95
---
 dcae-analytics/dcae-analytics-model/pom.xml     | 112 ++++++------
 dcae-analytics/dcae-analytics-tca-core/pom.xml  |   2 +-
 dcae-analytics/dcae-analytics-tca-model/pom.xml |   2 +-
 dcae-analytics/dcae-analytics-tca-web/pom.xml   |   2 +-
 dcae-analytics/dcae-analytics-test/pom.xml      |   2 +-
 dcae-analytics/dcae-analytics-web/pom.xml       |   2 +-
 dcae-analytics/pom.xml                          | 220 ++++++++++++------------
 dcae-analytics/version.properties               |   2 +-
 8 files changed, 175 insertions(+), 169 deletions(-)

(limited to 'dcae-analytics')

diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml
index 28d2180..90a9b35 100644
--- a/dcae-analytics/dcae-analytics-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-model/pom.xml
@@ -19,30 +19,31 @@
   -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    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>
 
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-model</artifactId>
     <packaging>jar</packaging>
 
-    <!-- THIS MODULE CONTAINS MODELS COMMON FOR ALL DCAE ANALYTICS MODULES.
-     NOTE: THIS MODULE MUST NOT DEPEND ON ANY OTHER ANALYTICS MODULE IN COMPILE SCOPE. -->
+    <!-- THIS MODULE CONTAINS MODELS COMMON FOR ALL DCAE ANALYTICS MODULES. 
+        NOTE: THIS MODULE MUST NOT DEPEND ON ANY OTHER ANALYTICS MODULE IN COMPILE 
+        SCOPE. -->
     <name>DCAE Analytics Model</name>
     <description>Contains models (e.g. Common Event Format) which are common to DCAE Analytics</description>
 
-	<properties>
-		<main.basedir>${project.parent.basedir}</main.basedir>
-		<sdk.version>1.3.3</sdk.version>
-		<immutable.version>2.7.1</immutable.version>
-	</properties>
+    <properties>
+        <main.basedir>${project.parent.basedir}</main.basedir>
+        <sdk.version>1.5.0</sdk.version>
+        <immutable.version>2.7.1</immutable.version>
+    </properties>
 
     <dependencies>
 
@@ -62,8 +63,8 @@
             <artifactId>jackson-core</artifactId>
         </dependency>
         <dependency>
-           <groupId>com.fasterxml.jackson.dataformat</groupId>
-           <artifactId>jackson-dataformat-smile</artifactId>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-smile</artifactId>
         </dependency>
 
         <!-- JSON PATH -->
@@ -85,48 +86,51 @@
             <artifactId>dcae-analytics-test</artifactId>
         </dependency>
 
-	<dependency>
-		<groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
-		<artifactId>cbs-client</artifactId>
-		<version>${sdk.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.springframework</groupId>
-		<artifactId>spring-beans</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-context</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-webflux</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-autoconfigure</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>javax.validation</groupId>
-		<artifactId>validation-api</artifactId>
-	</dependency>
-        <dependency>
-                <groupId>org.immutables</groupId>
-                <artifactId>value</artifactId>
-                <version>${immutable.version}</version>
-                <scope>provided</scope>
+        <dependency>
+            <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
+            <artifactId>cbs-client</artifactId>
+            <version>${sdk.version}</version>
         </dependency>
-
-		<dependency>
-			<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
-			<artifactId>eelf-logger-logback-impl</artifactId>
-		</dependency>
-
-	</dependencies>
+        <dependency>
+            <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
+            <artifactId>dmaap-client</artifactId>
+            <version>${sdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor.netty</groupId>
+            <artifactId>reactor-netty</artifactId>
+            <version>0.9.12.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.immutables</groupId>
+            <artifactId>value</artifactId>
+            <version>${immutable.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
+            <artifactId>eelf-logger-logback-impl</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml
index 9c2b308..09d90e1 100644
--- a/dcae-analytics/dcae-analytics-tca-core/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-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 b9c820a..a24c3fd 100644
--- a/dcae-analytics/dcae-analytics-tca-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-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 1d9a89a..fdee04e 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-web</artifactId>
diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index 6530e5c..c705e15 100644
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-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 e6f7237..c0a20ce 100644
--- a/dcae-analytics/dcae-analytics-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-web</artifactId>
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index 5a6311e..7f8d169 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -19,16 +19,16 @@
   -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    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>
 
-	<parent>
-		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
-		<artifactId>tca-gen2-parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
+        <artifactId>tca-gen2-parent</artifactId>
+        <version>1.2.2-SNAPSHOT</version>
+    </parent>
 
     <artifactId>dcae-analytics</artifactId>
     <packaging>pom</packaging>
@@ -48,7 +48,7 @@
 
     <properties>
 
-        <!-- PROJECT SETTINGS-->
+        <!-- PROJECT SETTINGS -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <main.basedir>${project.basedir}</main.basedir>
@@ -59,7 +59,7 @@
         <spring.cloud.version>Finchley.RC2</spring.cloud.version>
         <spring.version>5.0.11.RELEASE</spring.version>
         <commons.text.version>1.4</commons.text.version>
-        <springfox-swagger2.version>2.9.2</springfox-swagger2.version>
+        <springfox-swagger2.version>3.0.0</springfox-swagger2.version>
         <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
         <findbugs.annotations.version>3.0.1</findbugs.annotations.version>
 
@@ -87,7 +87,7 @@
         <lombok.plugin.version>1.18.0.0</lombok.plugin.version>
         <gitcommitid.plugin.version>2.2.3</gitcommitid.plugin.version>
         <maven.build.helper.plugin.version>3.0.0</maven.build.helper.plugin.version>
-	    <docker-maven-version>1.0.0</docker-maven-version>
+        <docker-maven-version>1.0.0</docker-maven-version>
 
         <!--PLUGIN SETTINGS -->
         <compiler.source.version>11</compiler.source.version>
@@ -109,9 +109,8 @@
         <releases.path>content/repositories/releases/</releases.path>
         <docker.repository>nexus3.onap.org:10003</docker.repository>
         <jackson.version>2.11.0</jackson.version>
-        <undertow.version>2.0.27</undertow.version>
+        <undertow.version>2.2.2.Final</undertow.version>
         <spring-webflux.version>5.2.7.RELEASE</spring-webflux.version>
-        <spring-swagger-ui.version>2.10.5</spring-swagger-ui.version>
 
         <!-- SONAR EXCLUSIONS -->
         <!-- EXCLUDE TEST COVERAGE ON
@@ -188,7 +187,17 @@
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger-ui</artifactId>
-                <version>${spring-swagger-ui.version}</version>
+                <version>${springfox-swagger2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.plugin</groupId>
+                <artifactId>spring-plugin-core</artifactId>
+                <version>2.0.0.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.plugin</groupId>
+                <artifactId>spring-plugin-metadata</artifactId>
+                <version>2.0.0.RELEASE</version>
             </dependency>
 
             <!-- FIND BUGS -->
@@ -224,18 +233,18 @@
                 <version>${junit-jupiter.version}</version>
                 <scope>test</scope>
             </dependency>
-		    <dependency>
-		        <groupId>junit</groupId>
-		        <artifactId>junit</artifactId>
-		        <version>4.13</version>
-		        <scope>test</scope>
-		    </dependency>
-		    <dependency>
-		        <groupId>org.junit.vintage</groupId>
-		        <artifactId>junit-vintage-engine</artifactId>
-		        <version>5.6.2</version>
-		        <scope>test</scope>
-		    </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>5.6.2</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-engine</artifactId>
@@ -260,40 +269,40 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>${spring.boot.version}</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-web</artifactId>
-                </exclusion>
-                <exclusion>
-		            <groupId>org.springframework.boot</groupId>
-		            <artifactId>spring-boot-starter-test</artifactId>
-                </exclusion>
-                <exclusion>
-	                <groupId>org.mockito</groupId>
-	                <artifactId>mockito-core</artifactId>
-                </exclusion>
-                <exclusion>
-			        <groupId>io.undertow</groupId>
-			        <artifactId>undertow-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-webflux</artifactId>
-                </exclusion>
-                <exclusion>
-		            <groupId>com.fasterxml.jackson.core</groupId>
-		            <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-		            <groupId>com.fasterxml.jackson.dataformat</groupId>
-		            <artifactId>jackson-dataformat-smile</artifactId>
-                </exclusion>
-              </exclusions>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-web</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-test</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.undertow</groupId>
+                        <artifactId>undertow-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-webflux</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.dataformat</groupId>
+                        <artifactId>jackson-dataformat-smile</artifactId>
+                    </exclusion>
+                </exclusions>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -305,46 +314,46 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-			<dependency>
-			    <groupId>org.springframework</groupId>
-			    <artifactId>spring-webflux</artifactId>
-			    <version>${spring-webflux.version}</version>
-			</dependency>
-          <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-          </dependency>
-          <dependency>
-             <groupId>org.springframework.boot</groupId>
-             <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.2.0.RELEASE</version>
-          </dependency>
-          <dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-webflux</artifactId>
+                <version>${spring-webflux.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-test</artifactId>
+                <version>2.2.0.RELEASE</version>
+            </dependency>
+            <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>2.23.4</version>
-          </dependency>
-	      <dependency>
-	        <groupId>io.undertow</groupId>
-	        <artifactId>undertow-core</artifactId>
-	        <version>2.0.27.Final</version>
-	      </dependency>
-	        <dependency>
-	            <groupId>com.fasterxml.jackson.core</groupId>
-	            <artifactId>jackson-databind</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>io.undertow</groupId>
+                <artifactId>undertow-core</artifactId>
+                <version>${undertow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-smile</artifactId>
                 <version>${jackson.version}</version>
-	        </dependency>
-	        <dependency>
-			    <groupId>com.fasterxml.jackson.core</groupId>
-			    <artifactId>jackson-core</artifactId>
-			    <version>${jackson.version}</version>
             </dependency>
-			<dependency>
-			   <groupId>com.fasterxml.jackson.dataformat</groupId>
-			   <artifactId>jackson-dataformat-smile</artifactId>
-			   <version>${jackson.version}</version>
-			</dependency>
 
         </dependencies>
     </dependencyManagement>
@@ -435,7 +444,8 @@
                     <version>${maven-surefire-plugin.version}</version>
                     <configuration>
                         <skipTests>${skip.unit.tests}</skipTests>
-                        <argLine>-Xmx2048m -Djava.awt.headless=true -XX:+UseConcMarkSweepGC
+                        <argLine>-Xmx2048m -Djava.awt.headless=true
+                            -XX:+UseConcMarkSweepGC
                             -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError ${surefireArgLine}
                         </argLine>
                         <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
@@ -542,7 +552,7 @@
                             <id>validate</id>
                             <phase>validate</phase>
                             <configuration>
-				    <skip>true</skip>
+                                <skip>true</skip>
                                 <configLocation>${checkstyle.file.name}</configLocation>
                                 <suppressionsLocation>${checkstyle.suppression.file.name}</suppressionsLocation>
                                 <encoding>UTF-8</encoding>
@@ -677,17 +687,9 @@
                 </plugin>
 
                 <!-- DOCKER PLUGIN -->
-		<!--
-                <plugin>
-                    <groupId>com.spotify</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <version>${docker-maven-version}</version>
-                    <configuration>
-                        <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository>
-                        <tag>${project.version}</tag>
-                    </configuration>
-                </plugin>
-		-->
+                <!-- <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> 
+                    <version>${docker-maven-version}</version> <configuration> <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository> 
+                    <tag>${project.version}</tag> </configuration> </plugin> -->
 
             </plugins>
 
@@ -736,10 +738,10 @@
                 <artifactId>maven-pmd-plugin</artifactId>
             </plugin>
 
-	    <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-	    </plugin> 
+            </plugin>
 
             <plugin>
                 <groupId>org.jacoco</groupId>
diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties
index e2869cd..d67f858 100644
--- a/dcae-analytics/version.properties
+++ b/dcae-analytics/version.properties
@@ -18,7 +18,7 @@
 #
 major=1
 minor=2
-patch=1
+patch=2
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg