From 22b4b93be84e3a2f857a33bbbdee01ce17f4ffd6 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 19 Jul 2023 12:43:23 +0200
Subject: [PATCH] Replace jetbrains annotations package with jsr305

---
 pgpainless-sop/build.gradle                                    | 3 ++-
 .../org/pgpainless/sop/MatchMakingSecretKeyRingProtector.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pgpainless-sop/build.gradle b/pgpainless-sop/build.gradle
index 3a911a86..bb4ddaca 100644
--- a/pgpainless-sop/build.gradle
+++ b/pgpainless-sop/build.gradle
@@ -14,7 +14,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:20.1.0'
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
@@ -27,6 +26,8 @@ dependencies {
 
     implementation(project(":pgpainless-core"))
     api "org.pgpainless:sop-java:$sopJavaVersion"
+
+    implementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 
 test {
diff --git a/pgpainless-sop/src/main/java/org/pgpainless/sop/MatchMakingSecretKeyRingProtector.java b/pgpainless-sop/src/main/java/org/pgpainless/sop/MatchMakingSecretKeyRingProtector.java
index 0b88cb5d..5badf1f1 100644
--- a/pgpainless-sop/src/main/java/org/pgpainless/sop/MatchMakingSecretKeyRingProtector.java
+++ b/pgpainless-sop/src/main/java/org/pgpainless/sop/MatchMakingSecretKeyRingProtector.java
@@ -12,7 +12,6 @@ import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
-import org.jetbrains.annotations.Nullable;
 import org.pgpainless.implementation.ImplementationFactory;
 import org.pgpainless.key.info.KeyInfo;
 import org.pgpainless.key.protection.CachingSecretKeyRingProtector;
@@ -20,6 +19,8 @@ import org.pgpainless.key.protection.SecretKeyRingProtector;
 import org.pgpainless.key.protection.UnlockSecretKey;
 import org.pgpainless.util.Passphrase;
 
+import javax.annotation.Nullable;
+
 /**
  * Implementation of the {@link SecretKeyRingProtector} which can be handed passphrases and keys separately,
  * and which then matches up passphrases and keys when needed.