merge unit test and integration test results

Author: germanattanasio

.utility/travis.sh

@@ -2,8 +2,10 @@
 
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
 	echo '$TRAVIS_PULL_REQUEST is false, running all tests'
-	mvn clean cobertura:cobertura-integration-test coveralls:report
+	mvn clean integration-test
 else
 	echo '$TRAVIS_PULL_REQUEST is not false ($TRAVIS_PULL_REQUEST), running unit tests'
 	mvn clean test
 fi
+# merge the unit test and integration test reports
+mvn jacoco:merge

pom.xml

@@ -128,23 +128,6 @@
 					<goals>deploy</goals>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<format>xml</format>
-					<instrumentation>
-						<excludes>
-							<exclude>com/ibm/watson/developer_cloud/*/v*/model/**/*.class</exclude>
-						</excludes>
-						<excludes>
-							<exclude>com/ibm/watson/developer_cloud/*/**/*Example.class</exclude>
-						</excludes>
-					</instrumentation>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.eluder.coveralls</groupId>
 				<artifactId>coveralls-maven-plugin</artifactId>
@@ -178,47 +161,53 @@
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.7.5.201505241946</version>
-				<configuration>
-					<excludes>
-						<exclude>com/ibm/watson/developer_cloud/*/v*/model/**/*.class</exclude>
-						<exclude>com/ibm/watson/developer_cloud/**/*Example.*</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
+        <configuration>
+          <fileSets>
+            <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+              <directory>${project.build.directory}</directory>
+              <includes>
+                <include>*.exec</include>
+              </includes>
+            </fileSet>
+          </fileSets>
+          <excludes>
+            <exclude>com/ibm/watson/developer_cloud/*/v*/model/**/*.class</exclude>
+            <exclude>com/ibm/watson/developer_cloud/**/*Example.*</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+            <execution>
+              <id>prepare-unit-test-agent</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+            </execution>
+            <execution>
+              <id>generate-unit-test-report</id>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+            </execution>
+            <execution>
+              <id>prepare-integration-test-agent</id>
+              <goals>
+                <goal>prepare-agent-integration</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>generate-integration-test-report</id>
+              <goals>
+                <goal>report-integration</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>merge</id>
+              <goals>
+                <goal>merge</goal>
+              </goals>
+            </execution>
+          </executions>
 			</plugin>
-<!-- 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>animal-sniffer-maven-plugin</artifactId>
-				<version>1.11</version>
-				<executions>
-					<execution>
-						<phase>test</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<signature>
-						<groupId>org.codehaus.mojo.signature</groupId>
-						<artifactId>java16</artifactId>
-						<version>1.1</version>
-					</signature>
-				</configuration>
-			</plugin> -->
 		</plugins>
 		<resources>
 			<resource>