diff --git a/fit/pom.xml b/fit/pom.xml
index 0946c547e..de4f3e03b 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -81,14 +81,10 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>7.0.54</version>
-      <!--<version>8.0.9</version>-->
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-logging-juli</artifactId>
-      <version>7.0.54</version>
-      <!--<version>8.0.9</version>-->
     </dependency>
 
     <dependency>
@@ -173,8 +169,7 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <includes>**/olingo/**/*.class</includes>
-              <excludes>**/*.properties</excludes>
+              <includeGroupIds>${project.groupId}</includeGroupIds>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
diff --git a/lib/server-test/pom.xml b/lib/server-test/pom.xml
index 3f478f455..abc843339 100644
--- a/lib/server-test/pom.xml
+++ b/lib/server-test/pom.xml
@@ -46,6 +46,10 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -80,8 +84,9 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <includes>**/olingo/**/*.class</includes>
-              <excludes>**/*.properties</excludes>
+              <!--<includes>**/olingo/**/*.class</includes>-->
+              <!--<excludes>**/*.properties</excludes>-->
+              <includeGroupIds>${project.groupId}</includeGroupIds>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
diff --git a/pom.xml b/pom.xml
index 180aa81de..6c87d6747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,6 +229,17 @@
         <version>${spring.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.tomcat.embed</groupId>
+        <artifactId>tomcat-embed-core</artifactId>
+        <version>${tomcat.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat.embed</groupId>
+        <artifactId>tomcat-embed-logging-juli</artifactId>
+        <version>${tomcat.version}</version>
+      </dependency>
+
       <!-- Pojogen Maven Plugin depenencies -->
       <dependency>
         <groupId>org.apache.velocity</groupId>
@@ -345,11 +356,6 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.9.1</version>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.cargo</groupId>
-          <artifactId>cargo-maven2-plugin</artifactId>
-          <version>1.4.8</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
@@ -448,22 +454,6 @@
           </delimiters>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <configuration>
-          <container>
-            <containerId>tomcat7x</containerId>
-            <zipUrlInstaller>
-              <url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
-              <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
-              <extractDir>${project.build.directory}/cargo/extract</extractDir>
-            </zipUrlInstaller>
-            <log>${cargo.log}</log>
-            <output>${cargo.output}</output>
-          </container>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>