diff options
| author |   Eran (ev672n), Vosk <ev672n@att.com> | 2018-10-22 12:59:57 +0300 |
|---|---|---|
| committer | Eran (ev672n), Vosk <ev672n@att.com> | 2018-10-22 12:59:57 +0300 |
| commit | bdc15ad66739869abef7413e5da40191875781d1 (patch) | |
| tree | f1363c8bbaa25a229c8c59c0efad44879af46593 | |
| parent | cb464aa710a8aec6b0ef36fdff21caf39bfb7ecb (diff) | |
security check issues
updating spring version, using security check issues
Change-Id: I42f717e5177269c7521777ea135b8a0b273648a6
Issue-ID: SDC-1829
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
| -rw-r--r-- | pom.xml | 42 | ||||
| -rw-r--r-- | src/main/java/org/onap/sdc/dcae/FeApp.java | 2 |
2 files changed, 36 insertions, 8 deletions
@@ -9,13 +9,12 @@ <name>dcae-dt</name> <url>DCAE FE</url> - <parent> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>1.5.9.RELEASE</version> - <relativePath /> - <!-- lookup parent from repository --> - </parent> + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>2.0.5.RELEASE</version> + <relativePath /> <!-- lookup parent from repository --> + </parent> <properties> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> @@ -50,6 +49,10 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -85,6 +88,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.8.5</version> </dependency> <dependency> <groupId>org.json</groupId> @@ -107,6 +111,10 @@ <artifactId>slf4j-api</artifactId> </exclusion> <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> + <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> @@ -129,6 +137,10 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -154,10 +166,12 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.8.5</version> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> + <version>20160810</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -174,6 +188,10 @@ <artifactId>slf4j-api</artifactId> </exclusion> <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> + <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> @@ -378,6 +396,16 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + <configuration> + <classifier>exec</classifier> + </configuration> + </execution> + </executions> <configuration> <webXml>src/main/webapp/WEB-INF/web.xml</webXml> <webResources> diff --git a/src/main/java/org/onap/sdc/dcae/FeApp.java b/src/main/java/org/onap/sdc/dcae/FeApp.java index c2e3bc9..7b5687c 100644 --- a/src/main/java/org/onap/sdc/dcae/FeApp.java +++ b/src/main/java/org/onap/sdc/dcae/FeApp.java @@ -7,7 +7,7 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.web.servlet.ServletRegistrationBean; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.*; import javax.servlet.ServletContext; |