Skip to content

Commit 037a6dc

Browse files
Merge branch 'release/1.2.7'
2 parents 654684c + 659e66a commit 037a6dc

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed

pom.xml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.cryptomator</groupId>
55
<artifactId>webdav-nio-adapter</artifactId>
6-
<version>1.2.6</version>
6+
<version>1.2.7</version>
77
<name>WebDAV-NIO Adapter</name>
88
<description>Embedded Jetty serving a WebDAV servlet to access resources at a given NIO path.</description>
99
<url>https://github.com/cryptomator/webdav-nio-adapter</url>
@@ -18,14 +18,19 @@
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919

2020
<!-- dependencies -->
21-
<webdavservlet.version>1.2.0</webdavservlet.version>
22-
<dagger.version>2.37</dagger.version>
23-
<jetty.version>10.0.6</jetty.version>
24-
<guava.version>30.1.1-jre</guava.version>
25-
<slf4j.version>1.7.31</slf4j.version>
21+
<webdavservlet.version>1.2.1</webdavservlet.version>
22+
<dagger.version>2.41</dagger.version>
23+
<jetty.version>10.0.8</jetty.version>
24+
<guava.version>31.1-jre</guava.version>
25+
<slf4j.version>1.7.36</slf4j.version>
2626

2727
<!-- test dependencies -->
28-
<junit.jupiter.version>5.7.2</junit.jupiter.version>
28+
<junit.jupiter.version>5.8.2</junit.jupiter.version>
29+
30+
<!-- mvn plugin dependencies -->
31+
<dependency-check.version>7.0.0</dependency-check.version>
32+
<jacoco.version>0.8.7</jacoco.version>
33+
<nexus-staging.version>1.6.8</nexus-staging.version>
2934
</properties>
3035

3136
<licenses>
@@ -106,7 +111,7 @@
106111
<plugin>
107112
<groupId>org.apache.maven.plugins</groupId>
108113
<artifactId>maven-compiler-plugin</artifactId>
109-
<version>3.8.1</version>
114+
<version>3.10.1</version>
110115
<configuration>
111116
<release>11</release>
112117
<showWarnings>true</showWarnings>
@@ -127,7 +132,7 @@
127132
<plugin>
128133
<groupId>org.apache.maven.plugins</groupId>
129134
<artifactId>maven-jar-plugin</artifactId>
130-
<version>3.2.0</version>
135+
<version>3.2.2</version>
131136
</plugin>
132137
<plugin>
133138
<artifactId>maven-source-plugin</artifactId>
@@ -143,7 +148,7 @@
143148
</plugin>
144149
<plugin>
145150
<artifactId>maven-javadoc-plugin</artifactId>
146-
<version>3.3.0</version>
151+
<version>3.3.2</version>
147152
<executions>
148153
<execution>
149154
<id>attach-javadocs</id>
@@ -164,7 +169,7 @@
164169
<plugin>
165170
<groupId>org.owasp</groupId>
166171
<artifactId>dependency-check-maven</artifactId>
167-
<version>6.2.2</version>
172+
<version>${dependency-check.version}</version>
168173
<configuration>
169174
<cveValidForHours>24</cveValidForHours>
170175
<failBuildOnCVSS>0</failBuildOnCVSS>
@@ -193,7 +198,7 @@
193198
<plugin>
194199
<groupId>org.jacoco</groupId>
195200
<artifactId>jacoco-maven-plugin</artifactId>
196-
<version>0.8.7</version>
201+
<version>${jacoco.version}</version>
197202
<executions>
198203
<execution>
199204
<id>prepare-agent</id>
@@ -246,19 +251,19 @@
246251
<repository>
247252
<id>ossrh</id>
248253
<name>Maven Central</name>
249-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
254+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
250255
</repository>
251256
</distributionManagement>
252257
<build>
253258
<plugins>
254259
<plugin>
255260
<groupId>org.sonatype.plugins</groupId>
256261
<artifactId>nexus-staging-maven-plugin</artifactId>
257-
<version>1.6.8</version>
262+
<version>${nexus-staging.version}</version>
258263
<extensions>true</extensions>
259264
<configuration>
260265
<serverId>ossrh</serverId>
261-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
266+
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
262267
<autoReleaseAfterClose>true</autoReleaseAfterClose>
263268
</configuration>
264269
</plugin>

suppression.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@
1313
<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
1414
<cpe regex="true">.*</cpe>
1515
</suppress>
16+
<suppress>
17+
<notes><![CDATA[
18+
Incorrectly matched CPE, see https://github.com/jeremylong/DependencyCheck/issues/4177git
19+
]]></notes>
20+
<gav regex="true">org\.cryptomator:.*</gav>
21+
<cpe>cpe:/a:cryptomator:cryptomator</cpe>
22+
<cve>CVE-2022-25366</cve>
23+
</suppress>
24+
1625
</suppressions>

0 commit comments

Comments
 (0)