diff --git a/data-node/src/main/java/org/graylog/datanode/configuration/DatanodeDirectories.java b/data-node/src/main/java/org/graylog/datanode/configuration/DatanodeDirectories.java
index 9840aa1a43..914a7b3d58 100644
--- a/data-node/src/main/java/org/graylog/datanode/configuration/DatanodeDirectories.java
+++ b/data-node/src/main/java/org/graylog/datanode/configuration/DatanodeDirectories.java
@@ -18,7 +18,7 @@ package org.graylog.datanode.configuration;
 
 import org.graylog.datanode.Configuration;
 import org.graylog2.plugin.system.NodeId;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,8 +72,8 @@ public class DatanodeDirectories {
      * TODO: Remove in 6.0 release
      */
     @Deprecated(forRemoval = true)
-    @NotNull
-    protected static Path backwardsCompatible(@NotNull Path path, NodeId nodeId, String configProperty) {
+    @Nonnull
+    protected static Path backwardsCompatible(@Nonnull Path path, NodeId nodeId, String configProperty) {
         final Path nodeIdSubdir = path.resolve(nodeId.getNodeId());
         if(Files.exists(nodeIdSubdir) && Files.isDirectory(nodeIdSubdir)) {
             LOG.warn("Caution, this datanode instance uses old format of directories. Please configure {} to point directly to {}", configProperty, nodeIdSubdir.toAbsolutePath());
@@ -132,7 +132,7 @@ public class DatanodeDirectories {
         return createRestrictedAccessFile(resolvedPath);
     }
 
-    @NotNull
+    @Nonnull
     private static Path createRestrictedAccessFile(Path resolvedPath) throws IOException {
         Files.deleteIfExists(resolvedPath);
         final Set<PosixFilePermission> permissions = Set.of(PosixFilePermission.OWNER_WRITE, PosixFilePermission.OWNER_READ);
diff --git a/data-node/src/main/java/org/graylog/datanode/initializers/JerseyService.java b/data-node/src/main/java/org/graylog/datanode/initializers/JerseyService.java
index d3f39e5662..f01dc5073a 100644
--- a/data-node/src/main/java/org/graylog/datanode/initializers/JerseyService.java
+++ b/data-node/src/main/java/org/graylog/datanode/initializers/JerseyService.java
@@ -58,7 +58,7 @@ import org.graylog2.rest.MoreMediaTypes;
 import org.graylog2.shared.rest.exceptionmappers.JacksonPropertyExceptionMapper;
 import org.graylog2.shared.rest.exceptionmappers.JsonProcessingExceptionMapper;
 import org.graylog2.shared.security.tls.KeyStoreUtils;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -264,7 +264,7 @@ public class JerseyService extends AbstractIdleService {
         return httpServer;
     }
 
-    @NotNull
+    @Nonnull
     private ContainerRequestFilter createAuthFilter(Configuration configuration) {
         final ContainerRequestFilter basicAuthFilter = new BasicAuthFilter(configuration.getRootUsername(), configuration.getRootPasswordSha2(), "Datanode");
         final AuthTokenValidator tokenVerifier = new JwtTokenValidator(configuration.getPasswordSecret());
diff --git a/data-node/src/main/java/org/graylog/datanode/periodicals/MetricsCollector.java b/data-node/src/main/java/org/graylog/datanode/periodicals/MetricsCollector.java
index 5e7ce36903..34cdcc4a52 100644
--- a/data-node/src/main/java/org/graylog/datanode/periodicals/MetricsCollector.java
+++ b/data-node/src/main/java/org/graylog/datanode/periodicals/MetricsCollector.java
@@ -38,7 +38,7 @@ import org.graylog.shaded.opensearch2.org.opensearch.search.builder.SearchSource
 import org.graylog.shaded.opensearch2.org.opensearch.search.sort.SortBuilders;
 import org.graylog.shaded.opensearch2.org.opensearch.search.sort.SortOrder;
 import org.graylog2.plugin.periodical.Periodical;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -98,7 +98,7 @@ public class MetricsCollector extends Periodical {
         return 60;
     }
 
-    @NotNull
+    @Nonnull
     @Override
     protected Logger getLogger() {
         return LOG;
diff --git a/data-node/src/test/java/org/graylog/datanode/configuration/OpensearchDistributionProviderTest.java b/data-node/src/test/java/org/graylog/datanode/configuration/OpensearchDistributionProviderTest.java
index 1d911bc841..eff234e998 100644
--- a/data-node/src/test/java/org/graylog/datanode/configuration/OpensearchDistributionProviderTest.java
+++ b/data-node/src/test/java/org/graylog/datanode/configuration/OpensearchDistributionProviderTest.java
@@ -18,7 +18,7 @@ package org.graylog.datanode.configuration;
 
 import org.assertj.core.api.Assertions;
 import org.graylog.datanode.OpensearchDistribution;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -95,7 +95,7 @@ class OpensearchDistributionProviderTest {
         Assertions.assertThat(dist.architecture()).isEqualTo(OpensearchArchitecture.x64);
     }
 
-    @NotNull
+    @Nonnull
     private OpensearchDistributionProvider provider(Path dir, OpensearchArchitecture arch) {
         return new OpensearchDistributionProvider(dir, arch);
     }
diff --git a/data-node/src/test/java/org/graylog/datanode/initializers/DatanodeAuthFilterTest.java b/data-node/src/test/java/org/graylog/datanode/initializers/DatanodeAuthFilterTest.java
index 57a7827a79..5b3f8b22b3 100644
--- a/data-node/src/test/java/org/graylog/datanode/initializers/DatanodeAuthFilterTest.java
+++ b/data-node/src/test/java/org/graylog/datanode/initializers/DatanodeAuthFilterTest.java
@@ -19,7 +19,7 @@ package org.graylog.datanode.initializers;
 import jakarta.ws.rs.container.ContainerRequestFilter;
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import org.glassfish.jersey.server.ContainerRequest;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
@@ -45,7 +45,7 @@ class DatanodeAuthFilterTest {
         Mockito.verify(request, Mockito.never()).abortWith(Mockito.any());
     }
 
-    @NotNull
+    @Nonnull
     private static AuthTokenValidator tokenValidator(String expectedTokenValue) {
         return token -> {
             if (!expectedTokenValue.equals(token)) {
diff --git a/data-node/src/test/java/org/graylog/datanode/initializers/JwtTokenValidatorTest.java b/data-node/src/test/java/org/graylog/datanode/initializers/JwtTokenValidatorTest.java
index b3656bbef1..90fc96a639 100644
--- a/data-node/src/test/java/org/graylog/datanode/initializers/JwtTokenValidatorTest.java
+++ b/data-node/src/test/java/org/graylog/datanode/initializers/JwtTokenValidatorTest.java
@@ -19,7 +19,7 @@ package org.graylog.datanode.initializers;
 import com.github.joschi.jadconfig.util.Duration;
 import org.assertj.core.api.Assertions;
 import org.graylog2.security.IndexerJwtAuthTokenProvider;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
@@ -61,7 +61,7 @@ class JwtTokenValidatorTest {
         return header + token.substring(token.indexOf('.'), token.lastIndexOf('.') + 1);
     }
 
-    @NotNull
+    @Nonnull
     private static String generateToken(String signingKey) {
         return IndexerJwtAuthTokenProvider.createToken(signingKey.getBytes(StandardCharsets.UTF_8), Duration.seconds(180));
     }
diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeProvisioningIT.java b/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeProvisioningIT.java
index 68ff3b475d..2df342a90c 100644
--- a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeProvisioningIT.java
+++ b/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeProvisioningIT.java
@@ -42,7 +42,7 @@ import org.graylog.testing.containermatrix.annotations.ContainerMatrixTest;
 import org.graylog.testing.containermatrix.annotations.ContainerMatrixTestsConfiguration;
 import org.graylog2.cluster.preflight.DataNodeProvisioningConfig;
 import org.graylog2.security.IndexerJwtAuthTokenProvider;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.ByteArrayInputStream;
@@ -191,7 +191,7 @@ public class DatanodeProvisioningIT {
         return IndexerJwtAuthTokenProvider.createToken(DatanodeContainerizedBackend.SIGNING_SECRET.getBytes(StandardCharsets.UTF_8), Duration.seconds(600));
     }
 
-    @NotNull
+    @Nonnull
     private KeyStore keystoreFromApiCertificate(BasicAuthCredentials basicAuth) throws KeyStoreException, CertificateException, IOException, NoSuchAlgorithmException {
         final byte[] certificate = given()
                 .spec(apis.requestSpecification())
diff --git a/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/DataStreamAdapterES7.java b/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/DataStreamAdapterES7.java
index 2fb5719cca..54010604cc 100644
--- a/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/DataStreamAdapterES7.java
+++ b/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/DataStreamAdapterES7.java
@@ -19,13 +19,13 @@ package org.graylog.storage.elasticsearch7;
 import org.graylog2.indexer.datastream.DataStreamAdapter;
 import org.graylog2.indexer.datastream.Policy;
 import org.graylog2.indexer.indices.Template;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 public class DataStreamAdapterES7 implements DataStreamAdapter {
     private static final String ERROR_MESSAGE = "Data Streams not supported in Elastic Search";
 
     @Override
-    public boolean ensureDataStreamTemplate(@NotNull String templateName, @NotNull Template template, @NotNull String timestampField) {
+    public boolean ensureDataStreamTemplate(@Nonnull String templateName, @Nonnull Template template, @Nonnull String timestampField) {
         throw new UnsupportedOperationException(ERROR_MESSAGE);
     }
 
@@ -35,12 +35,12 @@ public class DataStreamAdapterES7 implements DataStreamAdapter {
     }
 
     @Override
-    public void applyIsmPolicy(@NotNull String dataStreamName, @NotNull Policy policy) {
+    public void applyIsmPolicy(@Nonnull String dataStreamName, @Nonnull Policy policy) {
         throw new UnsupportedOperationException(ERROR_MESSAGE);
     }
 
     @Override
-    public void setNumberOfReplicas(@NotNull String dataStreamName, @NotNull int replicas) {
+    public void setNumberOfReplicas(@Nonnull String dataStreamName, @Nonnull int replicas) {
         throw new UnsupportedOperationException(ERROR_MESSAGE);
     }
 }
diff --git a/graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/views/export/ElasticsearchExportBackendIT.java b/graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/views/export/ElasticsearchExportBackendIT.java
index 315446961f..0bec152ea5 100644
--- a/graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/views/export/ElasticsearchExportBackendIT.java
+++ b/graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/views/export/ElasticsearchExportBackendIT.java
@@ -32,7 +32,7 @@ import org.graylog.testing.elasticsearch.SkipDefaultIndexTemplate;
 import org.graylog2.indexer.ElasticsearchException;
 import org.graylog2.plugin.Message;
 import org.graylog2.plugin.indexer.searches.timeranges.AbsoluteRange;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.joda.time.DateTimeZone;
 import org.junit.After;
 import org.junit.Before;
@@ -280,7 +280,7 @@ public class ElasticsearchExportBackendIT extends ElasticsearchBaseTest {
                 .isInstanceOf(ExportException.class);
     }
 
-    @NotNull
+    @Nonnull
     private static Map<String, Object> mappingWithOutAlias() {
         return Map.of("properties",
                 Map.of(
@@ -297,7 +297,7 @@ public class ElasticsearchExportBackendIT extends ElasticsearchBaseTest {
         );
     }
 
-    @NotNull
+    @Nonnull
     private static Map<String, Object> mappingWithAlias() {
         return Map.of("properties",
                 Map.of(
diff --git a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ProxyRequestAdapterOS2.java b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ProxyRequestAdapterOS2.java
index d1a7c67291..6ba0475186 100644
--- a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ProxyRequestAdapterOS2.java
+++ b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ProxyRequestAdapterOS2.java
@@ -29,7 +29,7 @@ import org.graylog.shaded.opensearch2.org.opensearch.client.RestHighLevelClient;
 import org.graylog2.cluster.nodes.DataNodeDto;
 import org.graylog2.indexer.datanode.ProxyRequestAdapter;
 import org.graylog2.rest.resources.datanodes.DatanodeResolver;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 import java.net.URI;
@@ -67,7 +67,7 @@ public class ProxyRequestAdapterOS2 implements ProxyRequestAdapter {
         }
     }
 
-    @NotNull
+    @Nonnull
     private static ProxyResponse getProxyResponse(int status, Response response) throws IOException {
         return new ProxyResponse(status, response.getEntity().getContent(), response.getEntity().getContentType().getValue());
     }
diff --git a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/RestClientProvider.java b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/RestClientProvider.java
index d45cadb253..1a0a7f69bb 100644
--- a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/RestClientProvider.java
+++ b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/RestClientProvider.java
@@ -32,7 +32,7 @@ import org.graylog2.configuration.RunsWithDataNode;
 import org.graylog2.security.IndexerJwtAuthTokenProvider;
 import org.graylog2.security.TrustManagerAndSocketFactoryProvider;
 import org.graylog2.system.shutdown.GracefulShutdownService;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 import java.net.URI;
 import java.util.List;
@@ -69,7 +69,7 @@ public class RestClientProvider implements Provider<RestHighLevelClient> {
     }
 
 
-    @NotNull
+    @Nonnull
     private RestHighLevelClient createClient(List<URI> hosts) {
         final RestHighLevelClient client = buildBasicRestClient(hosts);
 
diff --git a/graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/views/export/OpenSearchExportBackendIT.java b/graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/views/export/OpenSearchExportBackendIT.java
index 16dde72ce7..9eed5395b9 100644
--- a/graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/views/export/OpenSearchExportBackendIT.java
+++ b/graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/views/export/OpenSearchExportBackendIT.java
@@ -32,7 +32,7 @@ import org.graylog.testing.elasticsearch.SkipDefaultIndexTemplate;
 import org.graylog2.indexer.ElasticsearchException;
 import org.graylog2.plugin.Message;
 import org.graylog2.plugin.indexer.searches.timeranges.AbsoluteRange;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.joda.time.DateTimeZone;
 import org.junit.After;
 import org.junit.Before;
@@ -278,7 +278,7 @@ public class OpenSearchExportBackendIT extends ElasticsearchBaseTest {
                 .isInstanceOf(ExportException.class);
     }
 
-    @NotNull
+    @Nonnull
     private static Map<String, Object> mappingWithOutAlias() {
         return Map.of("properties",
                 Map.of(
@@ -295,7 +295,7 @@ public class OpenSearchExportBackendIT extends ElasticsearchBaseTest {
         );
     }
 
-    @NotNull
+    @Nonnull
     private static Map<String, Object> mappingWithAlias() {
         return Map.of("properties",
                 Map.of(
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/elasticsearch/FieldTypesLookup.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/elasticsearch/FieldTypesLookup.java
index 6978e11b44..4642a253ed 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/elasticsearch/FieldTypesLookup.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/elasticsearch/FieldTypesLookup.java
@@ -23,7 +23,7 @@ import org.graylog2.indexer.fieldtypes.IndexFieldTypesService;
 
 import jakarta.inject.Inject;
 import org.graylog2.streams.StreamService;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -60,7 +60,7 @@ public class FieldTypesLookup {
         return indexFieldTypesService.findForIndexSets(indexSetIds);
     }
 
-    @NotNull
+    @Nonnull
     private Set<String> getIndexSetIds(Collection<String> streamIds) {
         return streamService.loadByIds(streamIds)
                 .stream()
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilder.java b/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilder.java
index 3e12a1b741..4b8eb2e03c 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilder.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilder.java
@@ -24,7 +24,7 @@ import com.google.common.annotations.VisibleForTesting;
 import org.graylog.plugins.views.storage.migration.state.actions.MigrationActions;
 import org.graylog.plugins.views.storage.migration.state.persistence.DatanodeMigrationConfiguration;
 import org.graylog.plugins.views.storage.migration.state.persistence.DatanodeMigrationPersistence;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,7 +32,7 @@ public class MigrationStateMachineBuilder {
 
     private static final Logger LOG = LoggerFactory.getLogger(MigrationStateMachineBuilder.class);
 
-    @NotNull
+    @Nonnull
     private static StateMachineConfig<MigrationState, MigrationStep> configureStates(MigrationActions migrationActions) {
 
         // All actions which can fail should be performed on transition to make sure that there is no state change on error.
diff --git a/graylog2-server/src/main/java/org/graylog/security/certutil/CaServiceImpl.java b/graylog2-server/src/main/java/org/graylog/security/certutil/CaServiceImpl.java
index b8aae9a7fe..3558d4bc34 100644
--- a/graylog2-server/src/main/java/org/graylog/security/certutil/CaServiceImpl.java
+++ b/graylog2-server/src/main/java/org/graylog/security/certutil/CaServiceImpl.java
@@ -27,14 +27,12 @@ import org.graylog.security.certutil.ca.exceptions.CACreationException;
 import org.graylog.security.certutil.ca.exceptions.KeyStoreStorageException;
 import org.graylog.security.certutil.keystore.storage.KeystoreFileStorage;
 import org.graylog.security.certutil.keystore.storage.KeystoreMongoStorage;
-import org.graylog.security.certutil.keystore.storage.location.KeystoreMongoCollections;
 import org.graylog.security.certutil.keystore.storage.location.KeystoreMongoLocation;
 import org.graylog2.Configuration;
 import org.graylog2.bootstrap.preflight.web.resources.model.CA;
 import org.graylog2.bootstrap.preflight.web.resources.model.CAType;
 import org.graylog2.cluster.certificates.CertificatesService;
 import org.graylog2.events.ClusterEventBus;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/GraylogCertificateProvisioningPeriodical.java b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/GraylogCertificateProvisioningPeriodical.java
index 5c967cccad..07f48b584b 100644
--- a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/GraylogCertificateProvisioningPeriodical.java
+++ b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/GraylogCertificateProvisioningPeriodical.java
@@ -50,7 +50,7 @@ import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.plugin.periodical.Periodical;
 import org.graylog2.security.CustomCAX509TrustManager;
 import org.graylog2.security.IndexerJwtAuthTokenProvider;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -295,7 +295,7 @@ public class GraylogCertificateProvisioningPeriodical extends Periodical {
         }
     }
 
-    @NotNull
+    @Nonnull
     @Override
     protected Logger getLogger() {
         return LOG;
diff --git a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/NullNotificationService.java b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/NullNotificationService.java
index 82507c1bb1..731f0a44b2 100644
--- a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/NullNotificationService.java
+++ b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/NullNotificationService.java
@@ -16,6 +16,7 @@
  */
 package org.graylog2.bootstrap.preflight;
 
+import jakarta.annotation.Nullable;
 import org.graylog2.cluster.Node;
 import org.graylog2.notifications.Notification;
 import org.graylog2.notifications.NotificationService;
@@ -23,7 +24,6 @@ import org.graylog2.plugin.database.Persisted;
 import org.graylog2.plugin.database.ValidationException;
 import org.graylog2.plugin.database.validators.ValidationResult;
 import org.graylog2.plugin.database.validators.Validator;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/PreflightJerseyService.java b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/PreflightJerseyService.java
index 976209eda1..0edda084d6 100644
--- a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/PreflightJerseyService.java
+++ b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/PreflightJerseyService.java
@@ -44,7 +44,7 @@ import org.graylog2.rest.MoreMediaTypes;
 import org.graylog2.shared.rest.exceptionmappers.AnyExceptionClassMapper;
 import org.graylog2.shared.rest.exceptionmappers.JacksonPropertyExceptionMapper;
 import org.graylog2.shared.rest.exceptionmappers.JsonProcessingExceptionMapper;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -199,7 +199,7 @@ public class PreflightJerseyService extends AbstractIdleService {
                 .register(createBasicAuthFilter(localConfiguration, preflightConfigService));
     }
 
-    @NotNull
+    @Nonnull
     private BasicAuthFilter createBasicAuthFilter(Configuration localConfiguration, PreflightConfigService preflightConfigService) {
         final String username = localConfiguration.getRootUsername();
         final String preflightPassword = preflightConfigService.getPreflightPassword();
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/BasicIndexTemplateProvider.java b/graylog2-server/src/main/java/org/graylog2/indexer/BasicIndexTemplateProvider.java
index 0c5af0e506..3a3687b58f 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/BasicIndexTemplateProvider.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/BasicIndexTemplateProvider.java
@@ -18,7 +18,7 @@ package org.graylog2.indexer;
 
 import org.graylog2.indexer.indexset.IndexSetConfig;
 import org.graylog2.storage.SearchVersion;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 import static org.graylog2.storage.SearchVersion.Distribution.DATANODE;
 import static org.graylog2.storage.SearchVersion.Distribution.ELASTICSEARCH;
@@ -26,9 +26,9 @@ import static org.graylog2.storage.SearchVersion.Distribution.OPENSEARCH;
 
 public abstract class BasicIndexTemplateProvider<T extends IndexMappingTemplate> implements IndexTemplateProvider<T> {
 
-    @NotNull
+    @Nonnull
     @Override
-    public T create(@NotNull SearchVersion searchVersion,
+    public T create(@Nonnull SearchVersion searchVersion,
                                        IndexSetConfig indexSetConfig) throws IgnoreIndexTemplate {
         if (isProperSearchVersion(searchVersion)) {
             return createTemplateInstance();
@@ -37,7 +37,7 @@ public abstract class BasicIndexTemplateProvider<T extends IndexMappingTemplate>
         }
     }
 
-    private boolean isProperSearchVersion(@NotNull SearchVersion searchVersion) {
+    private boolean isProperSearchVersion(@Nonnull SearchVersion searchVersion) {
         return searchVersion.satisfies(ELASTICSEARCH, "^7.0.0")
                 || searchVersion.satisfies(OPENSEARCH, "^1.0.0 | ^2.0.0")
                 || searchVersion.satisfies(DATANODE, "^5.2.0");
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/fieldtypes/IndexFieldTypesListService.java b/graylog2-server/src/main/java/org/graylog2/indexer/fieldtypes/IndexFieldTypesListService.java
index 948724a140..29d3e159d4 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/fieldtypes/IndexFieldTypesListService.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/fieldtypes/IndexFieldTypesListService.java
@@ -33,7 +33,7 @@ import org.graylog2.indexer.indexset.profile.IndexFieldTypeProfileService;
 import org.graylog2.rest.models.tools.responses.PageListResponse;
 import org.graylog2.rest.resources.entities.Sorting;
 import org.graylog2.rest.resources.system.indexer.responses.IndexSetFieldType;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.List;
@@ -116,7 +116,7 @@ public class IndexFieldTypesListService {
         return getFilteredList(indexSetId, fieldNameQuery);
     }
 
-    @NotNull
+    @Nonnull
     private List<IndexSetFieldType> getFilteredList(String indexSetId, String fieldNameQuery, List<String> filters, String sort, Sorting.Direction order) {
         final Optional<IndexSetConfig> indexSetConfig = indexSetService.get(indexSetId);
         final Optional<IndexSet> mongoIndexSet = indexSetConfig.map(indexSetFactory::create);
@@ -151,7 +151,7 @@ public class IndexFieldTypesListService {
                 .toList();
     }
 
-    @NotNull
+    @Nonnull
     private Map<String, List<IndexSetFieldType>> getFilteredList(Set<String> indexSetIds, Collection<String> fieldNames) {
         final var indexSetConfigs = indexSetService.findByIds(indexSetIds);
         final var mongoIndexSets = indexSetConfigs.stream().collect(Collectors.toMap(IndexSetConfig::id, indexSetFactory::create));
diff --git a/graylog2-server/src/main/java/org/graylog2/rest/resources/datanodes/DatanodeRestApiProxy.java b/graylog2-server/src/main/java/org/graylog2/rest/resources/datanodes/DatanodeRestApiProxy.java
index df947a62ca..152b916a98 100644
--- a/graylog2-server/src/main/java/org/graylog2/rest/resources/datanodes/DatanodeRestApiProxy.java
+++ b/graylog2-server/src/main/java/org/graylog2/rest/resources/datanodes/DatanodeRestApiProxy.java
@@ -36,7 +36,7 @@ import org.graylog2.cluster.nodes.NodeDto;
 import org.graylog2.cluster.nodes.NodeService;
 import org.graylog2.indexer.datanode.ProxyRequestAdapter;
 import org.graylog2.security.IndexerJwtAuthTokenProvider;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -68,7 +68,7 @@ public class DatanodeRestApiProxy implements ProxyRequestAdapter {
         httpClient = withTimeout(okHttpClient, defaultProxyTimeout);
     }
 
-    @NotNull
+    @Nonnull
     private static OkHttpClient withTimeout(OkHttpClient okHttpClient, com.github.joschi.jadconfig.util.Duration defaultProxyTimeout) {
         final Duration timeout = Duration.ofMillis(defaultProxyTimeout.toMilliseconds());
         return okHttpClient.newBuilder()
@@ -97,7 +97,7 @@ public class DatanodeRestApiProxy implements ProxyRequestAdapter {
         }
     }
 
-    @NotNull
+    @Nonnull
     private static ByteArrayOutputStream copyRequestBody(ProxyRequest request) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try (InputStream requestBody = request.body()) {
@@ -146,7 +146,7 @@ public class DatanodeRestApiProxy implements ProxyRequestAdapter {
         return response.header("Content-Type");
     }
 
-    @NotNull
+    @Nonnull
     private static RequestBody getBody(ProxyRequest request) throws IOException {
         return RequestBody.create(IOUtils.toByteArray(request.body()), MediaType.parse("application/json"));
     }
diff --git a/graylog2-server/src/main/java/org/mongojack/DBCursor.java b/graylog2-server/src/main/java/org/mongojack/DBCursor.java
index 14ab111a9f..28d5ab83b3 100644
--- a/graylog2-server/src/main/java/org/mongojack/DBCursor.java
+++ b/graylog2-server/src/main/java/org/mongojack/DBCursor.java
@@ -21,7 +21,7 @@ import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCursor;
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 
 import javax.annotation.concurrent.NotThreadSafe;
 import java.io.Closeable;
@@ -106,7 +106,7 @@ public class DBCursor<T> implements Closeable, Iterator<T>, Iterable<T> {
         return Ints.saturatedCast(collection.countDocuments(filter));
     }
 
-    @NotNull
+    @Nonnull
     @Override
     public Iterator<T> iterator() {
         return new DBCursor<>(collection, filter, () -> findIterable);
diff --git a/graylog2-server/src/test/java/org/graylog/events/processor/aggregation/AggregationEventProcessorTest.java b/graylog2-server/src/test/java/org/graylog/events/processor/aggregation/AggregationEventProcessorTest.java
index 2474a14112..21fcb39a22 100644
--- a/graylog2-server/src/test/java/org/graylog/events/processor/aggregation/AggregationEventProcessorTest.java
+++ b/graylog2-server/src/test/java/org/graylog/events/processor/aggregation/AggregationEventProcessorTest.java
@@ -19,6 +19,7 @@ package org.graylog.events.processor.aggregation;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import jakarta.annotation.Nonnull;
 import org.graylog.events.conditions.Expr;
 import org.graylog.events.event.Event;
 import org.graylog.events.event.EventFactory;
@@ -52,7 +53,6 @@ import org.graylog2.plugin.indexer.searches.timeranges.TimeRange;
 import org.graylog2.streams.StreamImpl;
 import org.graylog2.streams.StreamMock;
 import org.graylog2.streams.StreamService;
-import org.jetbrains.annotations.NotNull;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.Before;
@@ -62,7 +62,6 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -234,7 +233,7 @@ public class AggregationEventProcessorTest {
                 .build();
 
         final EventQuerySearchTypeSupplier queryModifier = new EventQuerySearchTypeSupplier() {
-            @NotNull
+            @Nonnull
             @Override
             public Set<SearchType> additionalSearchTypes(EventDefinition eventDefinition) {
                 fail("Should not be called in this test, we only look at the result in isolation");
diff --git a/graylog2-server/src/test/java/org/graylog/events/search/MoreSearchAdapterIT.java b/graylog2-server/src/test/java/org/graylog/events/search/MoreSearchAdapterIT.java
index 67589fa8e5..513444a994 100644
--- a/graylog2-server/src/test/java/org/graylog/events/search/MoreSearchAdapterIT.java
+++ b/graylog2-server/src/test/java/org/graylog/events/search/MoreSearchAdapterIT.java
@@ -21,7 +21,7 @@ import org.graylog2.indexer.results.ResultMessage;
 import org.graylog2.indexer.searches.Sorting;
 import org.graylog2.plugin.indexer.searches.timeranges.AbsoluteRange;
 import org.graylog2.plugin.indexer.searches.timeranges.RelativeRange;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.Before;
@@ -200,7 +200,7 @@ public abstract class MoreSearchAdapterIT extends ElasticsearchBaseTest {
         assertThat(allResults).isEmpty();
     }
 
-    @NotNull
+    @Nonnull
     private MoreSearchAdapter.ScrollEventsCallback getCountingAndCollectingScrollEventsCallback(AtomicInteger count,
                                                                                                 Collection<ResultMessage> allResults) {
         return (chunkResults, requestContinue) -> {
diff --git a/graylog2-server/src/test/java/org/graylog/plugins/pipelineprocessor/parser/PipelineRuleParserTest.java b/graylog2-server/src/test/java/org/graylog/plugins/pipelineprocessor/parser/PipelineRuleParserTest.java
index 9a6e201d60..e630a43764 100644
--- a/graylog2-server/src/test/java/org/graylog/plugins/pipelineprocessor/parser/PipelineRuleParserTest.java
+++ b/graylog2-server/src/test/java/org/graylog/plugins/pipelineprocessor/parser/PipelineRuleParserTest.java
@@ -60,7 +60,7 @@ import org.graylog2.plugin.InstantMillisProvider;
 import org.graylog2.plugin.Message;
 import org.graylog2.plugin.MessageFactory;
 import org.graylog2.plugin.TestMessageFactory;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeUtils;
 import org.joda.time.DateTimeZone;
@@ -716,13 +716,13 @@ public class PipelineRuleParserTest extends BaseParserTest {
             return ImmutableList.of();
         }
 
-        @NotNull
+        @Nonnull
         @Override
         protected String getRuleBuilderName() {
             return null;
         }
 
-        @NotNull
+        @Nonnull
         @Override
         protected String getRuleBuilderTitle() {
             return null;
diff --git a/graylog2-server/src/test/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilderTest.java b/graylog2-server/src/test/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilderTest.java
index 0c2e893512..4957b75c92 100644
--- a/graylog2-server/src/test/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilderTest.java
+++ b/graylog2-server/src/test/java/org/graylog/plugins/views/storage/migration/state/machine/MigrationStateMachineBuilderTest.java
@@ -18,7 +18,7 @@ package org.graylog.plugins.views.storage.migration.state.machine;
 
 import com.github.oxo42.stateless4j.StateMachine;
 import org.graylog.plugins.views.storage.migration.state.actions.MigrationActions;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -296,7 +296,7 @@ public class MigrationStateMachineBuilderTest {
         assertThat(stateMachine.getState()).isEqualTo(MigrationState.FINISHED);
     }
 
-    @NotNull
+    @Nonnull
     private StateMachine<MigrationState, MigrationStep> getStateMachine(MigrationState initialState) {
         return MigrationStateMachineBuilder.buildWithTestState(initialState, migrationActions);
     }
diff --git a/graylog2-server/src/test/java/org/graylog/testing/containermatrix/ContainerMatrixTestEngine.java b/graylog2-server/src/test/java/org/graylog/testing/containermatrix/ContainerMatrixTestEngine.java
index 5b45062d37..b643774fb7 100644
--- a/graylog2-server/src/test/java/org/graylog/testing/containermatrix/ContainerMatrixTestEngine.java
+++ b/graylog2-server/src/test/java/org/graylog/testing/containermatrix/ContainerMatrixTestEngine.java
@@ -25,7 +25,7 @@ import org.graylog.testing.completebackend.MavenProjectDirProvider;
 import org.graylog.testing.completebackend.PluginJarsProvider;
 import org.graylog.testing.containermatrix.annotations.ContainerMatrixTestsConfiguration;
 import org.graylog2.storage.SearchVersion;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.engine.config.CachingJupiterConfiguration;
 import org.junit.jupiter.engine.config.DefaultJupiterConfiguration;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
@@ -215,7 +215,7 @@ public class ContainerMatrixTestEngine extends ContainerMatrixHierarchicalTestEn
         return engineDescriptor;
     }
 
-    @NotNull
+    @Nonnull
     private Stream<ContainerMatrixTestsDescriptor> testClassToDescriptors(Class<?> clazz, ContainerMatrixEngineDescriptor engineDescriptor) {
         final ContainerMatrixTestsConfiguration annotation = clazz.getAnnotation(ContainerMatrixTestsConfiguration.class);
         final Class<? extends MavenProjectDirProvider> mavenProjectDirProvider = annotation.mavenProjectDirProvider();
diff --git a/graylog2-server/src/test/java/org/graylog2/bootstrap/preflight/web/BasicAuthFilterTest.java b/graylog2-server/src/test/java/org/graylog2/bootstrap/preflight/web/BasicAuthFilterTest.java
index ba8e7861c5..66624f926d 100644
--- a/graylog2-server/src/test/java/org/graylog2/bootstrap/preflight/web/BasicAuthFilterTest.java
+++ b/graylog2-server/src/test/java/org/graylog2/bootstrap/preflight/web/BasicAuthFilterTest.java
@@ -19,7 +19,7 @@ package org.graylog2.bootstrap.preflight.web;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.assertj.core.api.Assertions;
 import org.glassfish.jersey.server.ContainerRequest;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
@@ -79,7 +79,7 @@ class BasicAuthFilterTest {
         return request;
     }
 
-    @NotNull
+    @Nonnull
     private static String base64(String username, String password) {
         final String value = username + ":" + password;
         return new String(Base64.getEncoder().encode(value.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
diff --git a/graylog2-server/src/test/java/org/graylog2/indexer/migration/RemoteReindexMigrationTest.java b/graylog2-server/src/test/java/org/graylog2/indexer/migration/RemoteReindexMigrationTest.java
index c2e04f2f47..41e4070e14 100644
--- a/graylog2-server/src/test/java/org/graylog2/indexer/migration/RemoteReindexMigrationTest.java
+++ b/graylog2-server/src/test/java/org/graylog2/indexer/migration/RemoteReindexMigrationTest.java
@@ -23,7 +23,7 @@ import jakarta.annotation.Nonnull;
 import org.assertj.core.api.Assertions;
 import org.graylog2.indexer.datanode.RemoteReindexingMigrationAdapter;
 import org.graylog2.shared.bindings.providers.ObjectMapperProvider;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
@@ -44,7 +44,7 @@ class RemoteReindexMigrationTest {
         Assertions.assertThat(migration.progress()).isEqualTo(60);
     }
 
-    @NotNull
+    @Nonnull
     private static RemoteReindexIndex index(String indexName, RemoteReindexingMigrationAdapter.Status status) {
 
         final IndexMigrationProgress progress = switch (status) {
diff --git a/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyTest.java b/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyTest.java
index e860f46181..e9b94a9bcd 100644
--- a/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyTest.java
+++ b/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/MessageCountRotationStrategyTest.java
@@ -24,7 +24,7 @@ import org.graylog2.indexer.indices.Indices;
 import org.graylog2.indexer.rotation.common.IndexRotator;
 import org.graylog2.plugin.system.NodeId;
 import org.graylog2.plugin.system.SimpleNodeId;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -94,7 +94,7 @@ public class MessageCountRotationStrategyTest {
         reset(indexSet);
     }
 
-    @NotNull
+    @Nonnull
     private MessageCountRotationStrategy createStrategy() {
         return new MessageCountRotationStrategy(indices, new IndexRotator(indices, auditEventSender, nodeId));
     }
diff --git a/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyTest.java b/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyTest.java
index 8740b6df1a..a8f997e35d 100644
--- a/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyTest.java
+++ b/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/SizeBasedRotationStrategyTest.java
@@ -23,7 +23,7 @@ import org.graylog2.indexer.indices.Indices;
 import org.graylog2.indexer.rotation.common.IndexRotator;
 import org.graylog2.plugin.system.NodeId;
 import org.graylog2.plugin.system.SimpleNodeId;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -95,7 +95,7 @@ public class SizeBasedRotationStrategyTest {
         reset(indexSet);
     }
 
-    @NotNull
+    @Nonnull
     private SizeBasedRotationStrategy createStrategy() {
         return new SizeBasedRotationStrategy(indices, new IndexRotator(indices, auditEventSender, nodeId));
     }
diff --git a/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/TimeBasedSizeOptimizingStrategyTest.java b/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/TimeBasedSizeOptimizingStrategyTest.java
index 04885eba61..040f6b9f7c 100644
--- a/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/TimeBasedSizeOptimizingStrategyTest.java
+++ b/graylog2-server/src/test/java/org/graylog2/indexer/rotation/strategies/TimeBasedSizeOptimizingStrategyTest.java
@@ -28,7 +28,7 @@ import org.graylog2.indexer.retention.strategies.NoopRetentionStrategyConfig;
 import org.graylog2.indexer.rotation.common.IndexRotator;
 import org.graylog2.indexer.rotation.common.IndexRotator.Result;
 import org.graylog2.plugin.system.NodeId;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Days;
@@ -196,7 +196,7 @@ class TimeBasedSizeOptimizingStrategyTest {
         assertThat(result.shouldRotate()).isEqualTo(false);
     }
 
-    @NotNull
+    @Nonnull
     private TimeBasedSizeOptimizingStrategy createStrategy() {
         IndexRotator indexRotator = new IndexRotator(indices, auditEventSender, nodeId);
         return new TimeBasedSizeOptimizingStrategy(indices, elasticsearchConfiguration, clock, indexRotator);
diff --git a/graylog2-server/src/test/java/org/graylog2/rest/resources/system/inputs/InputsResourceTest.java b/graylog2-server/src/test/java/org/graylog2/rest/resources/system/inputs/InputsResourceTest.java
index 96e602dfc5..7e5cd8ef97 100644
--- a/graylog2-server/src/test/java/org/graylog2/rest/resources/system/inputs/InputsResourceTest.java
+++ b/graylog2-server/src/test/java/org/graylog2/rest/resources/system/inputs/InputsResourceTest.java
@@ -16,6 +16,7 @@
  */
 package org.graylog2.rest.resources.system.inputs;
 
+import jakarta.annotation.Nullable;
 import org.graylog2.Configuration;
 import org.graylog2.configuration.HttpConfiguration;
 import org.graylog2.inputs.InputService;
@@ -23,7 +24,6 @@ import org.graylog2.plugin.database.users.User;
 import org.graylog2.plugin.inputs.MessageInput;
 import org.graylog2.rest.models.system.inputs.requests.InputCreateRequest;
 import org.graylog2.shared.inputs.MessageInputFactory;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/graylog2-server/src/test/java/org/graylog2/system/jobs/SystemJobManagerTest.java b/graylog2-server/src/test/java/org/graylog2/system/jobs/SystemJobManagerTest.java
index 47cb130769..e9647174bb 100644
--- a/graylog2-server/src/test/java/org/graylog2/system/jobs/SystemJobManagerTest.java
+++ b/graylog2-server/src/test/java/org/graylog2/system/jobs/SystemJobManagerTest.java
@@ -21,7 +21,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.assertj.core.api.Assertions;
 import org.graylog2.system.activities.SystemMessageActivityWriter;
-import org.jetbrains.annotations.NotNull;
+import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
@@ -119,7 +119,7 @@ public class SystemJobManagerTest {
         assertEquals(1, manager.concurrentJobs(job1.getClass()));
     }
 
-    @NotNull
+    @Nonnull
     private static Callable<Optional<String>> wrapJobCatchException(SystemJobManager manager, LongRunningJob job1) {
         return () -> {
             try {
diff --git a/pom.xml b/pom.xml
index 9daec3b985..e9fed50423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -845,6 +845,9 @@
 
                             @defaultMessage Use jakarta.validation.
                             javax.validation.**
+
+                            org.jetbrains.annotations.NotNull @ Use jakarta.annotation.Nonnull
+                            org.jetbrains.annotations.Nullable @ Use jakarta.annotation.Nullable
                         ]]>
 
                     </signatures>