Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
infeo committed May 8, 2023
2 parents e57d0fb + 84adbeb commit 140c1ca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ Provides directory contents specified by a `java.nio.file.Path` via a FUSE files

Uses [jfuse](https://github.com/cryptomator/jfuse), i.e. you need to install the specified fuse drivers for your OS.

## Configuration Parameters
The following system properties are used:
* `org.cryptomator.frontend.fuse.mountTimeOut` - The mount timeout threshold in milliseonds. If the mounting operation exceeds it, the mounting is aborted.

## License

This project is dual-licensed under the AGPLv3 for FOSS projects as well as a commercial license for independent software vendors and resellers. If you want to use this library in applications, that are *not* licensed under the AGPL, feel free to contact our [support team](https://cryptomator.org/help/).
18 changes: 6 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>fuse-nio-adapter</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>FUSE-NIO-Adapter</name>
<description>Access resources at a given NIO path via FUSE.</description>
<url>https://github.com/cryptomator/fuse-nio-adapter</url>
Expand All @@ -23,16 +23,16 @@
<integrations-api.version>1.2.0</integrations-api.version>
<jfuse.version>0.5.1</jfuse.version>
<guava.version>31.1-jre</guava.version>
<slf4j.version>2.0.3</slf4j.version>
<caffeine.version>3.1.4</caffeine.version>
<slf4j.version>2.0.7</slf4j.version>
<caffeine.version>3.1.6</caffeine.version>

<!-- test dependencies -->
<junit.jupiter.version>5.9.2</junit.jupiter.version>
<mockito.version>5.2.0</mockito.version>
<junit.jupiter.version>5.9.3</junit.jupiter.version>
<mockito.version>5.3.1</mockito.version>
<cryptofs.version>2.6.4</cryptofs.version>

<!-- build dependencies -->
<dependency-check.version>8.1.2</dependency-check.version>
<dependency-check.version>8.2.1</dependency-check.version>
<maven.deploy.version>3.1.0</maven.deploy.version>
<jacoco.version>0.8.9</jacoco.version>
</properties>
Expand Down Expand Up @@ -138,12 +138,6 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>cryptofs</artifactId>
Expand Down

0 comments on commit 140c1ca

Please sign in to comment.