From 3b894ee29da6a9409bcc118a94b024d81586251a Mon Sep 17 00:00:00 2001 From: sunil unnava Date: Thu, 6 Sep 2018 20:37:53 -0400 Subject: [PATCH] Fixes for security vulnerabilities Issue-ID: DMAAP-738 Change-Id: Ie569c5eef3d015dd613e8c2f5b343da2f030f1e5 Signed-off-by: sunil unnava --- .../etc/appprops/MsgRtrApi.properties | 4 +- pom.xml | 263 +++++++++------------ .../att/nsa/dmaap/DMaaPWebExceptionMapperTest.java | 1 + version.properties | 2 +- 4 files changed, 117 insertions(+), 153 deletions(-) diff --git a/bundleconfig-local/etc/appprops/MsgRtrApi.properties b/bundleconfig-local/etc/appprops/MsgRtrApi.properties index 106a1af..552c6a7 100644 --- a/bundleconfig-local/etc/appprops/MsgRtrApi.properties +++ b/bundleconfig-local/etc/appprops/MsgRtrApi.properties @@ -37,7 +37,7 @@ ## Both Cambria and Kafka make use of Zookeeper. ## #config.zk.servers=172.18.1.1 -config.zk.servers= +config.zk.servers=10.12.5.108 #config.zk.root=/fe3c/cambria/config @@ -49,7 +49,7 @@ config.zk.servers= ## configurations (after removing "kafka.") ## if you want to change request.required.acks it can take this one value #kafka.metadata.broker.list=localhost:9092,localhost:9093 -kafka.metadata.broker.list=: +kafka.metadata.broker.list=10.12.5.108:9092 ##kafka.request.required.acks=-1 #kafka.client.zookeeper=${config.zk.servers} consumer.timeout.ms=100 diff --git a/pom.xml b/pom.xml index 1c298f0..1f97cc0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.onap.dmaap.messagerouter.messageservice dmaapMR1 - 1.1.6-SNAPSHOT + 1.1.7-SNAPSHOT dmaap-messagerouter-messageservice Message Router - Restful interface built for kafka @@ -209,29 +209,13 @@ - + org.codehaus.groovy groovy-eclipse-compiler @@ -246,7 +230,7 @@ UTF-8 ${basedir}/target/swm/package/nix/dist_files/ simpledemo - 1.5.0 + dmaap v1 3.0.7-oss @@ -278,8 +262,8 @@ workstation DEV - 1.1.6 - 2.17.6 + 1.1.7 + 2.21.1 /content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version} true true @@ -313,7 +297,7 @@ so). If you have a startup failure related to a missing dme2 class not found exception, please contact the AJSC team for assistance. You can email support at ajsc-Support . For more information regarding - the usage of the AJSC service pom.xml and management of dependencies, --> + the usage of the AJSC service pom.xml and management of dependencies, --> - - javax.activation - activation - - - - + + org.apache.zookeeper zookeeper 3.4.10 - org.grails - grails-bootstrap - 2.5.4 - compile - - - ant - org.apache.ant - - - jna - net.java.dev.jna - - - ant-trax - org.apache.ant - - - gant_groovy1.8 - org.codehaus.gant - - - ant-launcher - org.apache.ant - - - jline - jline - - - ivy - org.apache.ivy - - - jansi - org.fusesource.jansi - - - commons-logging - commons-logging - - - ant-junit - org.apache.ant - - - - + org.grails + grails-bootstrap + 2.5.4 + compile + + + ant + org.apache.ant + + + jna + net.java.dev.jna + + + ant-trax + org.apache.ant + + + gant_groovy1.8 + org.codehaus.gant + + + ant-launcher + org.apache.ant + + + jline + jline + + + ivy + org.apache.ivy + + + jansi + org.fusesource.jansi + + + commons-logging + commons-logging + + + ant-junit + org.apache.ant + + + + org.springframework spring-webmvc - 4.3.15.RELEASE + 4.3.18.RELEASE - + org.springframework spring-core - 4.3.15.RELEASE + 4.3.18.RELEASE - + org.springframework spring-beans - 4.3.15.RELEASE + 4.3.18.RELEASE - + org.springframework spring-context - 4.3.15.RELEASE + 4.3.18.RELEASE commons-io @@ -443,7 +419,7 @@ org.onap.dmaap.messagerouter.msgrtr msgrtr - 1.1.6 + 1.1.7 org.slf4j @@ -502,7 +478,7 @@ jackson-mapper-asl 1.9.13 org.codehaus.jackson jackson-core-asl 1.9.13 --> - + com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider @@ -521,28 +497,28 @@ 2.8.11.1 - org.grails - grails-web - 2.5.4 - - org.grails - grails-web-jsp - - + grails-web + 2.5.4 + + + org.grails + grails-web-jsp + + + + + org.codehaus.groovy + groovy-all + 2.4.8 + compile + + + jline + jline + + - - org.codehaus.groovy - groovy-all - 2.4.4 - compile - - - jline - jline - - - junit @@ -561,35 +537,24 @@ org.apache.cxf cxf-rt-rs-extension-providers - 3.0.12 - - - org.apache.cxf - cxf-rt-transports-http - - - - - org.apache.cxf - cxf-rt-transports-http - 3.1.16 + 3.2.2 + + org.codehaus.jettison jettison 1.3.7 - - dom4j - dom4j - 1.6.1 - provided - + com.att.ajsc ajsc-archetype-parent - 3.0.6-oss + 3.0.7-oss pom @@ -654,18 +619,11 @@ org.apache.camel camel-servlet ${camel.version} - + - + org.apache.camel @@ -713,6 +671,11 @@ camel-xmpp ${camel.version} + + org.igniterealtime.smack + smack-tcp + 4.1.0-rc1 + org.apache.camel camel-velocity @@ -802,7 +765,7 @@ com.att.ajsc ajsc-runner - + ${basedir}/ajsc-shared-config/etc diff --git a/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java b/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java index 370141e..8807b66 100644 --- a/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java +++ b/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java @@ -39,6 +39,7 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.modules.junit4.PowerMockRunner; import com.att.dmf.mr.exception.DMaaPErrorMessages; + @RunWith(PowerMockRunner.class) public class DMaaPWebExceptionMapperTest { diff --git a/version.properties b/version.properties index ccd6e4a..61001b0 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=6 +patch=7 base_version=${major}.${minor}.${patch} -- 2.16.6