diff --git a/.travis.yml b/.travis.yml index 5d7a338e1..6ca5f3d48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,7 @@ addons: build_command: "mvn -fmain/pom.xml clean test -DskipTests" 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 -Pcoverage -- mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Prelease +- mvn -fmain/pom.xml dependency:go-offline -Pcoverage,release script: - mvn --update-snapshots -fmain/pom.xml clean test jacoco:report verify -Pcoverage after_success: @@ -31,7 +29,8 @@ after_success: - 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 before_deploy: -- mvn -fmain/pom.xml -Prelease clean package -DskipTests +- jdk_switcher use oraclejdk9 +- mvn -fmain/pom.xml -Prelease package -DskipTests deploy: - provider: releases prerelease: false diff --git a/main/commons/pom.xml b/main/commons/pom.xml index de0538641..fcef4fb7e 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -38,10 +38,6 @@ com.google.dagger dagger-compiler - - com.google.auto - auto-common - com.google.dagger diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 4bb41f18c..97721fd3b 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -38,10 +38,6 @@ com.google.dagger dagger-compiler - - com.google.auto - auto-common - diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 65b6c492b..3c97807ef 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -38,10 +38,6 @@ com.google.dagger dagger-compiler - - com.google.auto - auto-common - diff --git a/main/pom.xml b/main/pom.xml index ca0fb5ae4..749d955d6 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,19 +24,19 @@ UTF-8 - 1.1.7 - 1.4.5 + 1.2.0-SNAPSHOT + 1.5.0-SNAPSHOT 1.0.3 - 1.1.0-SNAPSHOT + 2.0.0-SNAPSHOT 2.5 3.6 - 4.5.3 + 4.5.4 1.0.3 - 23.5-jre - 2.14 + 23.6-jre + 2.14.1 2.8.2 1.7.25 @@ -169,14 +169,6 @@ dagger-compiler ${dagger.version} true - provided - - - com.google.auto - auto-common - 0.9 - true - provided com.google.code.gson diff --git a/main/ui/pom.xml b/main/ui/pom.xml index a9263a3b4..c5a0980c9 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -76,10 +76,6 @@ com.google.dagger dagger-compiler - - com.google.auto - auto-common -