From 61839854f6f889a7d3d2e1d7eaac6fcd13df4a84 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 19 May 2024 02:26:50 +0300
Subject: javax.annotation -> jakarta.annotation

---
 pom.xml                                                      | 6 ------
 src/main/java/com/juick/ActivityPubManager.java              | 2 +-
 src/main/java/com/juick/CommandsManager.java                 | 2 +-
 src/main/java/com/juick/EmailManager.java                    | 2 +-
 src/main/java/com/juick/ServerManager.java                   | 2 +-
 src/main/java/com/juick/TelegramBotManager.java              | 2 +-
 src/main/java/com/juick/XMPPManager.java                     | 2 +-
 src/main/java/com/juick/model/User.java                      | 2 +-
 src/main/java/com/juick/service/ActivityPubService.java      | 2 +-
 src/main/java/com/juick/service/SocialService.java           | 2 +-
 src/main/java/com/juick/service/SubscriptionServiceImpl.java | 2 +-
 src/main/java/com/juick/service/component/SystemEvent.java   | 2 +-
 src/main/java/com/juick/www/api/SystemActivity.java          | 2 +-
 src/main/java/com/juick/www/rss/RepliesView.java             | 2 +-
 src/test/java/com/juick/server/MockDeleteListener.java       | 2 +-
 src/test/java/com/juick/server/MockNotificationListener.java | 2 +-
 src/test/java/com/juick/server/MockUpdateListener.java       | 2 +-
 17 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index a072a8d7..cebb3cc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,12 +218,6 @@
       <artifactId>churchkey</artifactId>
       <version>0.15</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.kotcrab.remark</groupId>
       <artifactId>remark</artifactId>
diff --git a/src/main/java/com/juick/ActivityPubManager.java b/src/main/java/com/juick/ActivityPubManager.java
index 707345ea..a581ef0d 100644
--- a/src/main/java/com/juick/ActivityPubManager.java
+++ b/src/main/java/com/juick/ActivityPubManager.java
@@ -53,7 +53,7 @@ import org.tomitribe.auth.signatures.Algorithm;
 import org.tomitribe.auth.signatures.Signature;
 import org.tomitribe.auth.signatures.Verifier;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/main/java/com/juick/CommandsManager.java b/src/main/java/com/juick/CommandsManager.java
index 5f35cb65..d389deaa 100644
--- a/src/main/java/com/juick/CommandsManager.java
+++ b/src/main/java/com/juick/CommandsManager.java
@@ -30,7 +30,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
 import com.juick.model.CommandResult;
diff --git a/src/main/java/com/juick/EmailManager.java b/src/main/java/com/juick/EmailManager.java
index 4310c4a1..df02fe1c 100644
--- a/src/main/java/com/juick/EmailManager.java
+++ b/src/main/java/com/juick/EmailManager.java
@@ -47,7 +47,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 import java.util.*;
 
diff --git a/src/main/java/com/juick/ServerManager.java b/src/main/java/com/juick/ServerManager.java
index 67eb705a..bc2e7a06 100644
--- a/src/main/java/com/juick/ServerManager.java
+++ b/src/main/java/com/juick/ServerManager.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/com/juick/TelegramBotManager.java b/src/main/java/com/juick/TelegramBotManager.java
index bb8d2c2c..99b8d873 100644
--- a/src/main/java/com/juick/TelegramBotManager.java
+++ b/src/main/java/com/juick/TelegramBotManager.java
@@ -55,7 +55,7 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import java.io.IOException;
diff --git a/src/main/java/com/juick/XMPPManager.java b/src/main/java/com/juick/XMPPManager.java
index 9e24c347..ab071260 100644
--- a/src/main/java/com/juick/XMPPManager.java
+++ b/src/main/java/com/juick/XMPPManager.java
@@ -65,7 +65,7 @@ import rocks.xmpp.extensions.vcard.temp.model.VCard;
 import rocks.xmpp.extensions.version.SoftwareVersionManager;
 import rocks.xmpp.extensions.version.model.SoftwareVersion;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
diff --git a/src/main/java/com/juick/model/User.java b/src/main/java/com/juick/model/User.java
index 7f04a744..438b208f 100644
--- a/src/main/java/com/juick/model/User.java
+++ b/src/main/java/com/juick/model/User.java
@@ -27,7 +27,7 @@ import jakarta.xml.bind.annotation.XmlTransient;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.Serializable;
 import java.net.URI;
 import java.time.Instant;
diff --git a/src/main/java/com/juick/service/ActivityPubService.java b/src/main/java/com/juick/service/ActivityPubService.java
index 544bf6a3..a63de1b6 100644
--- a/src/main/java/com/juick/service/ActivityPubService.java
+++ b/src/main/java/com/juick/service/ActivityPubService.java
@@ -41,7 +41,7 @@ import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 import org.tomitribe.auth.signatures.Base64;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 import java.io.IOException;
 import java.net.URI;
diff --git a/src/main/java/com/juick/service/SocialService.java b/src/main/java/com/juick/service/SocialService.java
index 2dbef8e5..fa280555 100644
--- a/src/main/java/com/juick/service/SocialService.java
+++ b/src/main/java/com/juick/service/SocialService.java
@@ -19,7 +19,7 @@ package com.juick.service;
 
 import com.juick.model.User;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.List;
 
 public interface SocialService {
diff --git a/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
index b8aaf86b..057490f8 100644
--- a/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
@@ -30,7 +30,7 @@ import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/juick/service/component/SystemEvent.java b/src/main/java/com/juick/service/component/SystemEvent.java
index 830813ad..9acd7a2b 100644
--- a/src/main/java/com/juick/service/component/SystemEvent.java
+++ b/src/main/java/com/juick/service/component/SystemEvent.java
@@ -17,7 +17,7 @@
 
 package com.juick.service.component;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.juick.www.api.SystemActivity;
 import org.springframework.context.ApplicationEvent;
diff --git a/src/main/java/com/juick/www/api/SystemActivity.java b/src/main/java/com/juick/www/api/SystemActivity.java
index a75ef3b6..33d4e1d3 100644
--- a/src/main/java/com/juick/www/api/SystemActivity.java
+++ b/src/main/java/com/juick/www/api/SystemActivity.java
@@ -23,7 +23,7 @@ import com.juick.model.User;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class SystemActivity {
     private SystemActivity(ActivityType type) {
diff --git a/src/main/java/com/juick/www/rss/RepliesView.java b/src/main/java/com/juick/www/rss/RepliesView.java
index 80548a79..47fb46b6 100644
--- a/src/main/java/com/juick/www/rss/RepliesView.java
+++ b/src/main/java/com/juick/www/rss/RepliesView.java
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.view.feed.AbstractRssFeedView;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
diff --git a/src/test/java/com/juick/server/MockDeleteListener.java b/src/test/java/com/juick/server/MockDeleteListener.java
index d060d865..20ee99bf 100644
--- a/src/test/java/com/juick/server/MockDeleteListener.java
+++ b/src/test/java/com/juick/server/MockDeleteListener.java
@@ -20,7 +20,7 @@ package com.juick.server;
 import com.juick.service.activities.DeleteUserEvent;
 import org.springframework.context.ApplicationListener;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class MockDeleteListener implements ApplicationListener<DeleteUserEvent> {
     @Override
diff --git a/src/test/java/com/juick/server/MockNotificationListener.java b/src/test/java/com/juick/server/MockNotificationListener.java
index fd91c3fd..ee9f1696 100644
--- a/src/test/java/com/juick/server/MockNotificationListener.java
+++ b/src/test/java/com/juick/server/MockNotificationListener.java
@@ -20,7 +20,7 @@ package com.juick.server;
 import com.juick.service.component.SystemEvent;
 import org.springframework.context.ApplicationListener;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class MockNotificationListener implements ApplicationListener<SystemEvent> {
     @Override
diff --git a/src/test/java/com/juick/server/MockUpdateListener.java b/src/test/java/com/juick/server/MockUpdateListener.java
index 08742b12..21c9b673 100644
--- a/src/test/java/com/juick/server/MockUpdateListener.java
+++ b/src/test/java/com/juick/server/MockUpdateListener.java
@@ -20,7 +20,7 @@ package com.juick.server;
 import com.juick.service.activities.UpdateEvent;
 import org.springframework.context.ApplicationListener;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class MockUpdateListener implements ApplicationListener<UpdateEvent> {
     @Override
-- 
cgit v1.2.3