From: Ram Koya <rk541m@att.com>
Date: Mon, 20 Aug 2018 18:08:27 +0000 (+0000)
Subject: Merge "Update for OOM integration"
X-Git-Tag: 1.0.1~82
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1a00b59927f6b0c17ccb7c40221ec9bce231c964;hp=e06737d701ff5b3dcab311f4337ce40be52c966e;p=dmaap%2Fdatarouter.git

Merge "Update for OOM integration"
---

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index bb0b7ffa..6cc396a1 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.7</version>
+            <version>${thoughtworks.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index a0624d2b..b3c28782 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.7</version>
+            <version>${thoughtworks.version}</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -208,7 +208,7 @@
         <dependency>
             <groupId>org.eclipse.jetty.cdi</groupId>
             <artifactId>cdi-websocket</artifactId>
-            <version>9.3.11.v20160721</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/pom.xml b/pom.xml
index c5aa2fb3..0fe61c02 100755
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,9 @@
         <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
         <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
-        <jetty.version>9.4.11.v20180605</jetty.version>
+        <jetty.version>9.4.12.RC2</jetty.version>
         <jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
+        <thoughtworks.version>1.4.10</thoughtworks.version>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>