Browse Source

updated dependencies and CI config

Sebastian Stenzel 7 years ago
parent
commit
6534242275
6 changed files with 9 additions and 34 deletions
  1. 3 4
      .travis.yml
  2. 0 4
      main/commons/pom.xml
  3. 0 4
      main/keychain/pom.xml
  4. 0 4
      main/launcher/pom.xml
  5. 6 14
      main/pom.xml
  6. 0 4
      main/ui/pom.xml

+ 3 - 4
.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

+ 0 - 4
main/commons/pom.xml

@@ -38,10 +38,6 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger-compiler</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.google.auto</groupId>
-			<artifactId>auto-common</artifactId>
-		</dependency>
 		
 		<dependency>
 			<groupId>com.google.dagger</groupId>

+ 0 - 4
main/keychain/pom.xml

@@ -38,10 +38,6 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger-compiler</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.google.auto</groupId>
-			<artifactId>auto-common</artifactId>
-		</dependency>
 		
 		<!-- Logging -->
 		<dependency>

+ 0 - 4
main/launcher/pom.xml

@@ -38,10 +38,6 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger-compiler</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.google.auto</groupId>
-			<artifactId>auto-common</artifactId>
-		</dependency>
 
 		<!-- Logging -->
 		<dependency>

+ 6 - 14
main/pom.xml

@@ -24,19 +24,19 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
-		<cryptomator.cryptolib.version>1.1.7</cryptomator.cryptolib.version>
-		<cryptomator.cryptofs.version>1.4.5</cryptomator.cryptofs.version>
+		<cryptomator.cryptolib.version>1.2.0-SNAPSHOT</cryptomator.cryptolib.version>
+		<cryptomator.cryptofs.version>1.5.0-SNAPSHOT</cryptomator.cryptofs.version>
 		<cryptomator.webdav.version>1.0.3</cryptomator.webdav.version>
-		<cryptomator.jni.version>1.1.0-SNAPSHOT</cryptomator.jni.version>
+		<cryptomator.jni.version>2.0.0-SNAPSHOT</cryptomator.jni.version>
 		
 		<commons-io.version>2.5</commons-io.version>
 		<commons-lang3.version>3.6</commons-lang3.version>
-		<httpclient.version>4.5.3</httpclient.version>
+		<httpclient.version>4.5.4</httpclient.version>
 		
 		<easybind.version>1.0.3</easybind.version>
 		
-		<guava.version>23.5-jre</guava.version>
-		<dagger.version>2.14</dagger.version>
+		<guava.version>23.6-jre</guava.version>
+		<dagger.version>2.14.1</dagger.version>
 		<gson.version>2.8.2</gson.version>
 		
 		<slf4j.version>1.7.25</slf4j.version>
@@ -169,14 +169,6 @@
 				<artifactId>dagger-compiler</artifactId>
 				<version>${dagger.version}</version>
 				<optional>true</optional>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.google.auto</groupId>
-				<artifactId>auto-common</artifactId>
-				<version>0.9</version>
-				<optional>true</optional>
-				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.google.code.gson</groupId>

+ 0 - 4
main/ui/pom.xml

@@ -76,10 +76,6 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger-compiler</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.google.auto</groupId>
-			<artifactId>auto-common</artifactId>
-		</dependency>
 
 		<!-- Zxcvbn -->
 		<dependency>