Merge "Make StatisticsTests test real methods"

[dmaap/datarouter.git] / datarouter-prov / pom.xml

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index a0650a0..a970f71 100755 (executable)
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -57,7 +57,7 @@
         <dependency>\r
             <groupId>com.thoughtworks.xstream</groupId>\r
             <artifactId>xstream</artifactId>\r
-            <version>1.4.7</version>\r
+            <version>${thoughtworks.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.json</groupId>\r
@@ -74,11 +74,6 @@
             <artifactId>eelf-core</artifactId>\r
             <version>0.0.1</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>javax.servlet</groupId>\r
-            <artifactId>servlet-api</artifactId>\r
-            <version>2.5</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.eclipse.jetty</groupId>\r
             <artifactId>jetty-server</artifactId>\r
@@ -213,7 +208,7 @@
         <dependency>\r
             <groupId>org.eclipse.jetty.cdi</groupId>\r
             <artifactId>cdi-websocket</artifactId>\r
-            <version>9.3.11.v20160721</version>\r
+            <version>${jetty.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>log4j</groupId>\r
@@ -282,7 +277,7 @@
                 <directory>src/main/resources</directory>\r
                 <filtering>true</filtering>\r
                 <includes>\r
-                    <include>**/proserver.properties</include>\r
+                    <include>**/provserver.properties</include>\r
                 </includes>\r
             </resource>\r
             <resource>\r