diff --git a/.travis.yml b/.travis.yml
index b2de1bb75..67ff14276 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,9 @@ cache:
- $HOME/.m2
env:
global:
- - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" #coverity
- - secure: "lV9OwUbHMrMpLUH1CY+Z4puLDdFXytudyPlG1eGRsesdpuG6KM3uQVz6uAtf6lrU8DRbMM/T7ML+PmvQ4UoPPYLdLxESLLBat2qUPOIVBOhTSlCc7I0DmGy04CSvkeMy8dPaQC0ukgNiR7zwoNzfcpGRN/U9S8tziDruuHoZSrg=" #bintray
+ - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" # COVERITY_SCAN_TOKEN
+ - secure: "lV9OwUbHMrMpLUH1CY+Z4puLDdFXytudyPlG1eGRsesdpuG6KM3uQVz6uAtf6lrU8DRbMM/T7ML+PmvQ4UoPPYLdLxESLLBat2qUPOIVBOhTSlCc7I0DmGy04CSvkeMy8dPaQC0ukgNiR7zwoNzfcpGRN/U9S8tziDruuHoZSrg=" # BINTRAY_API_KEY
+ - secure: "oWFgRTVP6lyTa7qVxlvkpm20MtVc3BtmsNXQJS6bfg2A0o/iCQMNx7OD59BaafCLGRKvCcJVESiC8FlSylVMS7CDSyYu0gg70NUiIuHp4NBM5inFWYCy/PdQsCTzr5uvNG+rMFQpMFRaCV0FrfM3tLondcVkhsHL68l93Xoexx4=" # CODACY_PROJECT_TOKEN
addons:
coverity_scan:
project:
@@ -19,19 +20,10 @@ addons:
branch_pattern: release.*
install:
# "clean" needed until https://bugs.openjdk.java.net/browse/JDK-8067747 is resolved.
-- mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Ptest-coverage
+- mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Pcoverage
- mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Prelease
script:
-- mvn --update-snapshots -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate
-after_success:
-- "bash <(curl -s https://codecov.io/bash)"
-notifications:
- webhooks:
- urls:
- - https://webhooks.gitter.im/e/7d429ab35361726e26f2
- on_success: change
- on_failure: always
- on_start: false
+- mvn --update-snapshots -fmain/pom.xml clean test jacoco:report verify -Pcoverage
before_deploy:
- mvn -fmain/pom.xml -Prelease clean package -DskipTests
deploy:
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index 2ab70cf6e..fa84ec417 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -53,13 +53,4 @@
test
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
-
-
-
diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml
index 2079aed52..0ad5961f0 100644
--- a/main/jacoco-report/pom.xml
+++ b/main/jacoco-report/pom.xml
@@ -11,6 +11,47 @@
Cryptomator Code Coverage Report
pom
+
+
+
+ org.cryptomator
+ commons
+
+
+ org.cryptomator
+ keychain
+
+
+ org.cryptomator
+ ui
+
+
+ org.cryptomator
+ launcher
+
+
+
+ org.apache.logging.log4j
+ *
+
+
+
+
+
+
+ com.codacy
+ codacy-coverage-reporter
+ 1.0.13
+ assembly
+
+
+ *
+ *
+
+
+
+
+
@@ -26,6 +67,28 @@
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.5.0
+
+
+ verify
+
+ java
+
+
+ com.codacy.CodacyCoverageReporter
+
+ -l
+ Java
+ -r
+ ${project.build.directory}/site/jacoco-aggregate/jacoco.xml
+
+
+
+
+
diff --git a/main/pom.xml b/main/pom.xml
index 125c1b513..a68891ee9 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -269,10 +269,18 @@
- test-coverage
+ coverage
jacoco-report
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 1e13bbf25..bc21e22f7 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -99,16 +99,9 @@
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
-
-
- org.apache.logging.log4j
- log4j-jul
+ org.slf4j
+ slf4j-simple
+ test