diff --git a/.travis.yml b/.travis.yml
index 5b65484a0..29889d91f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,11 +28,15 @@ install:
- curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/cryptobot/cf5fbd909c4782aaeeeb7c7f4a1a43da/raw/e60ee486e34ee0c79f89f947abe2c83b4290c6bb/settings.xml
- mvn -fmain/pom.xml clean install -DskipTests org.codehaus.mojo:versions-maven-plugin:help dependency:go-offline -Pcoverage,release # "clean install" needed until we can exclude artifacts currently in the reactor, see https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html#excludeReactor and https://issues.apache.org/jira/browse/MDEP-568
script:
-- mvn --update-snapshots -fmain/pom.xml clean test jacoco:report verify -Pcoverage
+- mvn --update-snapshots -fmain/pom.xml clean test verify -Pcoverage
after_success:
- jdk_switcher use oraclejdk8
-- curl -o ~/codacy-coverage-reporter-assembly-latest.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/2.0.1/codacy-coverage-reporter-2.0.1-assembly.jar
-- $JAVA_HOME/bin/java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r main/jacoco-report/target/site/jacoco-aggregate/jacoco.xml
+- curl -o ~/codacy-coverage-reporter-assembly-latest.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.1/codacy-coverage-reporter-4.0.1-assembly.jar
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter-assembly-latest.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter-assembly-latest.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter-assembly-latest.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter-assembly-latest.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter-assembly-latest.jar final
before_deploy:
- jdk_switcher use oraclejdk9
- |
diff --git a/main/jacoco-report/.gitignore b/main/jacoco-report/.gitignore
deleted file mode 100644
index b83d22266..000000000
--- a/main/jacoco-report/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml
deleted file mode 100644
index 691a1e456..000000000
--- a/main/jacoco-report/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
- 4.0.0
-
- org.cryptomator
- main
- 1.4.0-SNAPSHOT
-
- jacoco-report
- Cryptomator Code Coverage Report
- pom
-
-
-
-
- org.cryptomator
- commons
-
-
- org.cryptomator
- keychain
-
-
- org.cryptomator
- ui
-
-
- org.cryptomator
- launcher
-
-
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
-
-
- report-aggregate
- verify
-
- report-aggregate
-
-
-
-
-
-
-
diff --git a/main/pom.xml b/main/pom.xml
index bbe17f5e5..79b6c1548 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -249,9 +249,6 @@
coverage
-
- jacoco-report
-
@@ -293,6 +290,12 @@
prepare-agent
+
+ report
+
+ report
+
+