Merge "Re-adding version to parent pom"

[dmaap/datarouter.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1e239cd..11b0e9e 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
         <version>1.2.3</version>
     </parent>
     <properties>
-        <!--revision can be set in the version.properties file at project root and is loaded by all sub modules-->
-        <revision>${snapshot_version}</revision>
+        <!--revision must also be set in the version.properties file at project root-->
+        <revision>2.1.0</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -85,7 +85,6 @@
         <sl4j-api.version>1.7.25</sl4j-api.version>
         <hamcrest-lib.version>1.3</hamcrest-lib.version>
         <annotations.version>12.0</annotations.version>
-
     </properties>
     <modules>
         <module>datarouter-prov</module>
@@ -204,6 +203,10 @@
                         <groupId>org.databene</groupId>
                         <artifactId>contiperf</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.thoughtworks.xstream</groupId>
+                        <artifactId>xstream</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>