From: Pooja03 Date: Wed, 25 Apr 2018 05:23:41 +0000 (+0530) Subject: Security issue and FileNotFound Exception X-Git-Tag: 2.0.0-ONAP~7 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fbb4e65173e5e340d6bd7366a12a12558067690c;p=dcaegen2%2Fservices%2Fmapper.git Security issue and FileNotFound Exception Security issue to be addressed for fasterxml.jackson and FileNotFound Exception for MapperConfig.json Issue-ID: DCAEGEN2-467 Change-Id: Iba56ee61f9b8768a80ec88e423f7cb3e80961306 Signed-off-by: Pooja03 --- diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml index 2f8d63b..e6baf06 100644 --- a/UniversalVesAdapter/pom.xml +++ b/UniversalVesAdapter/pom.xml @@ -1,23 +1,15 @@ - + 4.0.0 @@ -27,9 +19,8 @@ 0.0.1 - + org.onap.dcaegen2.services.mapper mapper 0.0.1-SNAPSHOT @@ -57,12 +48,12 @@ org.springframework.boot spring-boot-starter-web - 2.0.0.RELEASE + 2.0.1.RELEASE org.springframework.boot spring-boot-starter-test - 2.0.0.RELEASE + 2.0.1.RELEASE test @@ -74,48 +65,48 @@ org.springframework.data spring-data-commons - 2.0.5.RELEASE + 2.0.6.RELEASE - com.fasterxml.jackson.core - jackson-databind - 2.9.4 - - - - - hsqldb - hsqldb - 1.8.0.10 - test - - - - - xalan - xalan - 2.7.2 - - - - - xerces - xercesImpl - 2.11.0-atlassian-01 - - - - - com.thoughtworks.xstream - xstream - 1.4.10 - - - - xml-apis - xml-apis - 1.4.01 - + com.fasterxml.jackson.core + jackson-databind + 2.9.5 + + + + + hsqldb + hsqldb + 1.8.0.10 + test + + + + + xalan + xalan + 2.7.2 + + + + + xerces + xercesImpl + 2.11.0-atlassian-01 + + + + + com.thoughtworks.xstream + xstream + 1.4.10 + + + + xml-apis + xml-apis + 1.4.01 + @@ -128,10 +119,18 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + 1 + + org.springframework.boot spring-boot-maven-plugin - 2.0.0.RELEASE + 2.0.0.RELEASE @@ -144,64 +143,65 @@ - com.spotify - docker-maven-plugin - ${docker.maven.version} - - false - ${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId} - openjdk:8-jre - ["java", "-jar", "/opt/${project.build.finalName}.jar", "server"] - - - /opt - ${project.build.directory} - ${project.build.finalName}.jar - - - - 8080 - - - ${project.version}-SNAPSHOT-${maven.build.timestamp}Z - ${project.version} - latest - - ${onap.nexus.dockerregistry.daily} - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/gen/java - - - - - regex-property - - regex-property - - - docker.version - ${project.version} - (^[0-9]+.[0-9]+.[0-9]+$) - $1-STAGING - false - - - - + com.spotify + docker-maven-plugin + ${docker.maven.version} + + false + ${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId} + openjdk:8-jre + ["java", "-jar", "/opt/${project.build.finalName}.jar", + "server"] + + + /opt + ${project.build.directory} + ${project.build.finalName}.jar + + + + 8080 + + + ${project.version}-SNAPSHOT-${maven.build.timestamp}Z + ${project.version} + latest + + ${onap.nexus.dockerregistry.daily} + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/gen/java + + + + + regex-property + + regex-property + + + docker.version + ${project.version} + (^[0-9]+.[0-9]+.[0-9]+$) + $1-STAGING + false + + + + diff --git a/UniversalVesAdapter/src/main/resources/application.properties b/UniversalVesAdapter/src/main/resources/application.properties index 0aefded..4841f4a 100644 --- a/UniversalVesAdapter/src/main/resources/application.properties +++ b/UniversalVesAdapter/src/main/resources/application.properties @@ -6,6 +6,6 @@ universal.configFiles=snmp:snmpTrapToVes.xml,default:defaultConfig.xml fileService.url=http://localhost:8888/fileAsString/ messagesInBatch=1000 messagesInTimeInterval=5000 -mapperConfig.file=MapperConfig.json -dmaap.consumer_props=/src/main/resources/dme2/consumer.properties -dmaap.publisher_props=/src/main/resources/dme2/publisher.properties \ No newline at end of file +mapperConfig.file=../UniversalVesAdapter/src/main/resources/MapperConfig.json +dmaap.consumer_props=../UniversalVesAdapter/src/main/resources/dme2/consumer.properties +dmaap.publisher_props=../UniversalVesAdapter/src/main/resources/dme2/publisher.properties \ No newline at end of file diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/configs/DMaapMrUrlConfigurationTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/configs/DMaapMrUrlConfigurationTest.java index ac9274d..c7497b4 100644 --- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/configs/DMaapMrUrlConfigurationTest.java +++ b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/configs/DMaapMrUrlConfigurationTest.java @@ -43,8 +43,8 @@ public class DMaapMrUrlConfigurationTest { String actualdata2 = dMaapMrUrlConfiguration.getPublisherProperties(); String actualdata3 = dMaapMrUrlConfiguration.getUrl(); - assertEquals("/src/main/resources/dme2/consumer.properties", actualdata1); - assertEquals("/src/main/resources/dme2/publisher.properties", actualdata2); + assertEquals("../UniversalVesAdapter/src/main/resources/dme2/consumer.properties", actualdata1); + assertEquals("../UniversalVesAdapter/src/main/resources/dme2/publisher.properties", actualdata2); assertEquals("http://localhost:8080/greeting12", actualdata3);