Skip to content

Commit

Permalink
Merge branch 'release/1.4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
overheadhunter committed Aug 16, 2017
2 parents 39a7993 + 506afe8 commit 96beb1c
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>cryptofs</artifactId>
<version>1.4.1</version>
<version>1.4.2</version>
<name>Cryptomator Crypto Filesystem</name>
<description>This library provides the Java filesystem provider used by Cryptomator.</description>
<url>https://github.com/cryptomator/cryptofs</url>
Expand All @@ -15,10 +15,9 @@

<properties>
<java.version>1.8</java.version>
<cryptolib.version>1.1.5</cryptolib.version>
<cryptolib.version>1.1.6</cryptolib.version>
<dagger.version>2.11</dagger.version>
<guava.version>22.0</guava.version>
<commons.lang.version>3.6</commons.lang.version>
<guava.version>23.0</guava.version>
<slf4j.version>1.7.25</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down Expand Up @@ -138,7 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.2</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand All @@ -163,7 +162,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>1.4.5</version>
<version>2.1.0</version>
<configuration>
<cveValidForHours>24</cveValidForHours>
<failBuildOnCVSS>0</failBuildOnCVSS>
Expand Down

0 comments on commit 96beb1c

Please sign in to comment.