Update 3rd components to secure version

Change-Id: Idaa55084f5ecb0dd3536c232cebc14fb50000007
Issue-ID: SO-1013
Signed-off-by: Siva.ye <yezhihua@huawei.com>

diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml
index 156ce80..b20d64c 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/pom.xml
+++ b/mso-api-handlers/mso-api-handler-common/pom.xml
@@ -18,8 +18,6 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                <swagger-version>1.3.0</swagger-version>
                <jax-rs-version>1.1.1</jax-rs-version>
-               <json4s-jackson-version>3.2.4</json4s-jackson-version>
-               <json4s-core-version>3.0.0</json4s-core-version>
                <reflections-version>0.9.9-RC1</reflections-version>
                <paranamer-version>2.5.2</paranamer-version>
                <scannotation-version>1.0.3</scannotation-version>
@@ -63,13 +61,11 @@
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-jackson_2.9.1-1</artifactId>
-                       <version>${json4s-jackson-version}</version>
+                       <artifactId>json4s-jackson_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-core_2.9.2</artifactId>
-                       <version>${json4s-core-version}</version>
+                       <artifactId>json4s-core_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>

diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 9439dca..aaa9b41 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -18,8 +18,6 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                <swagger-version>1.3.0</swagger-version>
                <jax-rs-version>1.1.1</jax-rs-version>
-               <json4s-jackson-version>3.2.4</json4s-jackson-version>
-               <json4s-core-version>3.0.0</json4s-core-version>
                <reflections-version>0.9.9-RC1</reflections-version>
                <paranamer-version>2.5.2</paranamer-version>
                <scannotation-version>1.0.3</scannotation-version>
@@ -98,13 +96,11 @@
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-jackson_2.9.1-1</artifactId>
-                       <version>${json4s-jackson-version}</version>
+                       <artifactId>json4s-jackson_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-core_2.9.2</artifactId>
-                       <version>${json4s-core-version}</version>
+                       <artifactId>json4s-core_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>

diff --git a/pom.xml b/pom.xml
index f6fc55a..2af02be 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,8 @@
                <openstack.version>1.3.0</openstack.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
                <springboot.version>1.5.13.RELEASE</springboot.version> 
+               <springframework.version>5.0.8.RELEASE</springframework.version>
+               <tomcat.version>8.5.33</tomcat.version>
                <originalClassifier>original</originalClassifier>
                <docker.skip>true</docker.skip>
                <docker.skip.build>true</docker.skip.build>
@@ -761,6 +763,51 @@
                        <artifactId>flyway-core</artifactId>
                        <version>4.2.0</version>
                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-core</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-el</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-websocket</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat</groupId>
+                                <artifactId>tomcat-annotations-api</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.json4s</groupId>
+                                <artifactId>json4s-jackson_2.12</artifactId>
+                                <version>3.6.0</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.json4s</groupId>
+                                <artifactId>json4s-core_2.12</artifactId>
+                                <version>3.6.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.commons</groupId>
+                            <artifactId>commons-email</artifactId>
+                            <version>1.5</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.immutables</groupId>
+                            <artifactId>value</artifactId>
+                            <version>2.7.1</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.eclipse.jetty</groupId>
+                            <artifactId>jetty-server</artifactId>
+                            <version>9.4.12.v20180830</version>
+                        </dependency>
                </dependencies>
        </dependencyManagement>
        <profiles>