Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
overheadhunter committed Mar 6, 2017
2 parents 17c2413 + 3cf0b0e commit 9ef9923
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 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.1.0</version>
<version>1.1.1</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,11 +15,11 @@

<properties>
<java.version>1.8</java.version>
<cryptolib.version>1.1.0</cryptolib.version>
<dagger.version>2.8</dagger.version>
<cryptolib.version>1.1.1</cryptolib.version>
<dagger.version>2.9</dagger.version>
<guava.version>21.0</guava.version>
<commons.lang.version>3.5</commons.lang.version>
<slf4j.version>1.7.22</slf4j.version>
<slf4j.version>1.7.24</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -114,7 +114,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.7.9</version>
<version>2.7.12</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -312,7 +312,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down

0 comments on commit 9ef9923

Please sign in to comment.