Merge branch 'release/1.4.2' into main

.github/workflows/publish-central.yml

@@ -7,7 +7,7 @@ on:
         required: true
         default: '0.0.0'
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/publish-github.yml

@@ -35,6 +35,6 @@ jobs:
           SLACK_ICON_EMOJI: ':bot:'
           SLACK_CHANNEL: 'cryptomator-desktop'
           SLACK_TITLE: "Published ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}"
-          SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions?query=workflow%3A%22Publish+to+Maven+Central%22|deploy to Maven Central>."
+          SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/publish-central.yml|deploy to Maven Central>."
           SLACK_FOOTER:
-          MSG_MINIMAL: true
+          MSG_MINIMAL: true

README.md

@@ -1,8 +1,8 @@
 # Java RFC 5297 SIV Authenticated Encryption
 
 [![Build](https://github.com/cryptomator/siv-mode/workflows/Build/badge.svg)](https://github.com/cryptomator/siv-mode/actions?query=workflow%3ABuild)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8b274788dab046259a40e56688236790)](https://www.codacy.com/app/cryptomator/siv-mode)
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/8b274788dab046259a40e56688236790)](https://www.codacy.com/app/cryptomator/siv-mode)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8b274788dab046259a40e56688236790)](https://www.codacy.com/gh/cryptomator/siv-mode/dashboard)
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/8b274788dab046259a40e56688236790)](https://www.codacy.com/gh/cryptomator/siv-mode/dashboard)
 [![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/siv-mode/badge.svg)](https://snyk.io/test/github/cryptomator/siv-mode)
 [![Maven Central](https://img.shields.io/maven-central/v/org.cryptomator/siv-mode.svg?maxAge=86400)](https://repo1.maven.org/maven2/org/cryptomator/siv-mode/)
 [![Javadocs](http://www.javadoc.io/badge/org.cryptomator/siv-mode.svg)](http://www.javadoc.io/doc/org.cryptomator/siv-mode)

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>siv-mode</artifactId>
-	<version>1.4.1</version>
+	<version>1.4.2</version>
 
 	<name>SIV Mode</name>
 	<description>RFC 5297 SIV mode: deterministic authenticated encryption</description>
@@ -41,10 +41,10 @@
 
 		<!-- test dependencies -->
 		<junit.version>5.7.1</junit.version>
-		<mockito.version>3.7.7</mockito.version>
-		<jmh.version>1.27</jmh.version>
+		<mockito.version>3.10.0</mockito.version>
+		<jmh.version>1.31</jmh.version>
 		<hamcrest.version>2.2</hamcrest.version>
-		<guava.version>30.1-jre</guava.version>
+		<guava.version>30.1.1-jre</guava.version>
 	</properties>
 
 	<dependencies>

src/main/java/org/cryptomator/siv/SivMode.java

@@ -17,7 +17,6 @@
 
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.SecretKey;
-import java.nio.ByteBuffer;
 import java.security.Provider;
 import java.util.Arrays;
 

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/macs/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.macs;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/modes/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.modes;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/paddings/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.paddings;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/params/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.params;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/util/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.util;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java9/module-info.java

@@ -1,4 +1,11 @@
 module org.cryptomator.siv {
-	exports org.cryptomator.siv;
 	requires static org.bouncycastle.provider;
+
+	exports org.cryptomator.siv;
+	exports org.cryptomator.siv.org.bouncycastle.crypto;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.macs;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.modes;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.paddings;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.params;
+	exports org.cryptomator.siv.org.bouncycastle.util;
 }