File tree Expand file tree Collapse file tree 2 files changed +19
-54
lines changed
Expand file tree Collapse file tree 2 files changed +19
-54
lines changed Original file line number Diff line number Diff line change 22
33if [ " ${TRAVIS_PULL_REQUEST} " = " false" ]; then
44 echo ' $TRAVIS_PULL_REQUEST is false, running all tests'
5- mvn clean integration-test
5+ mvn clean cobertura:cobertura- integration-test
66else
77 echo ' $TRAVIS_PULL_REQUEST is not false ($TRAVIS_PULL_REQUEST), running unit tests'
88 mvn clean test
9- fi
10- # merge the unit test and integration test reports
11- mvn jacoco:merge
9+ fi
Original file line number Diff line number Diff line change 157157 </execution >
158158 </executions >
159159 </plugin >
160- <plugin >
161- <groupId >org.jacoco</groupId >
162- <artifactId >jacoco-maven-plugin</artifactId >
163- <version >0.7.5.201505241946</version >
164- <configuration >
165- <fileSets >
166- <fileSet implementation =" org.apache.maven.shared.model.fileset.FileSet" >
167- <directory >${project.build.directory} </directory >
168- <includes >
169- <include >*.exec</include >
170- </includes >
171- </fileSet >
172- </fileSets >
173- <excludes >
174- <exclude >com/ibm/watson/developer_cloud/*/v*/model/**/*.class</exclude >
175- <exclude >com/ibm/watson/developer_cloud/**/*Example.*</exclude >
176- </excludes >
177- </configuration >
178- <executions >
179- <execution >
180- <id >prepare-unit-test-agent</id >
181- <goals >
182- <goal >prepare-agent</goal >
183- </goals >
184- </execution >
185- <execution >
186- <id >generate-unit-test-report</id >
187- <goals >
188- <goal >report</goal >
189- </goals >
190- </execution >
191- <execution >
192- <id >prepare-integration-test-agent</id >
193- <goals >
194- <goal >prepare-agent-integration</goal >
195- </goals >
196- </execution >
197- <execution >
198- <id >generate-integration-test-report</id >
199- <goals >
200- <goal >report-integration</goal >
201- </goals >
202- </execution >
203- <execution >
204- <id >merge</id >
205- <goals >
206- <goal >merge</goal >
207- </goals >
208- </execution >
209- </executions >
160+ <plugin >
161+ <groupId >org.codehaus.mojo</groupId >
162+ <artifactId >cobertura-maven-plugin</artifactId >
163+ <version >2.7</version >
164+ <configuration >
165+ <format >xml</format >
166+ <format >html</format >
167+ <aggregate >true</aggregate >
168+ <instrumentation >
169+ <excludes >
170+ <exclude >com/ibm/watson/developer_cloud/*/v*/model/**/*.class</exclude >
171+ </excludes >
172+ <excludes >
173+ <exclude >com/ibm/watson/developer_cloud/*/**/*Example.class</exclude >
174+ </excludes >
175+ </instrumentation >
176+ </configuration >
210177 </plugin >
211178 </plugins >
212179 <resources >
You can’t perform that action at this time.
0 commit comments