Uncap Dagger version (#2721)

The latest version of Dagger (2.55) now supports jakarta.inject.

common/gradle.lockfile

@@ -38,7 +38,7 @@ info.picocli:picocli:4.6.2=checkstyle
 io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.15=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 joda-time:joda-time:2.13.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath

common/src/main/java/google/registry/util/SystemClock.java

@@ -16,8 +16,8 @@ package google.registry.util;
 
 import static org.joda.time.DateTimeZone.UTC;
 
+import jakarta.inject.Inject;
 import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /** Clock implementation that proxies to the real system clock. */

common/src/main/java/google/registry/util/SystemSleeper.java

@@ -17,9 +17,9 @@ package google.registry.util;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.util.concurrent.Uninterruptibles;
+import jakarta.inject.Inject;
 import java.io.Serializable;
 import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
 import org.joda.time.ReadableDuration;
 
 /** Implementation of {@link Sleeper} for production use. */

config/presubmits.py

@@ -208,6 +208,12 @@ PRESUBMITS = {
         {"/node_modules/"},
     ):
         "Do not use javax.servlet.* Use jakarta.servlet.* instead.",
+    PresubmitCheck(
+        r".*javax\.inject\..*",
+        "java",
+        {"/node_modules/"},
+    ):
+        "Do not use javax.inject.* Use jakarta.inject.* instead.",
 }
 
 # Note that this regex only works for one kind of Flyway file.  If we want to

core/gradle.lockfile

@@ -157,10 +157,10 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClas
 com.google.code.gson:gson:2.10.1=soy
 com.google.code.gson:gson:2.12.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.common.html.types:types:1.0.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath
-com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor
-com.google.dagger:dagger-spi:2.51.1=annotationProcessor,testAnnotationProcessor
-com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor
+com.google.dagger:dagger-compiler:2.55=annotationProcessor,testAnnotationProcessor
+com.google.dagger:dagger-spi:2.55=annotationProcessor,testAnnotationProcessor
+com.google.dagger:dagger:2.55=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.28=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotations:2.20.0=soy
 com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
@@ -372,8 +372,7 @@ io.perfmark:perfmark-api:0.27.0=deploy_jar,nonprodRuntimeClasspath,runtimeClassp
 io.smallrye:jandex:3.1.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 jakarta-regexp:jakarta-regexp:1.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,deploy_jar,jaxb,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.inject:jakarta.inject-api:2.0.1=soy
+jakarta.inject:jakarta.inject-api:2.0.1=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.persistence:jakarta.persistence-api:3.2.0=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 jakarta.servlet:jakarta.servlet-api:6.0.0=testCompileClasspath,testRuntimeClasspath
@@ -502,11 +501,12 @@ org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,nonprodRuntimeClasspath,runtime
 org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor
 org.jetbrains.kotlin:kotlin-reflect:1.9.20=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=annotationProcessor,testAnnotationProcessor
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=annotationProcessor,testAnnotationProcessor
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotationProcessor
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=annotationProcessor,testAnnotationProcessor
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.0.21=annotationProcessor,testAnnotationProcessor
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -520,7 +520,7 @@ org.joda:joda-money:2.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,no
 org.json:json:20230618=soy
 org.json:json:20250107=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jsoup:jsoup:1.19.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 org.junit-pioneer:junit-pioneer:2.3.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.12.1=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.12.1=testCompileClasspath,testRuntimeClasspath

core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java

@@ -25,7 +25,7 @@ import com.google.common.flogger.FluentLogger;
 import google.registry.model.EppResource;
 import google.registry.persistence.VKey;
 import google.registry.request.Action;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/batch/CannedScriptExecutionAction.java

@@ -26,8 +26,8 @@ import google.registry.request.Response;
 import google.registry.request.UrlConnectionService;
 import google.registry.request.UrlConnectionUtils;
 import google.registry.request.auth.Auth;
+import jakarta.inject.Inject;
 import java.net.URL;
-import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 
 /**

core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java

@@ -31,8 +31,8 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.auth.Auth;
 import google.registry.ui.server.SendEmailUtils;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.Days;
 
 /**

core/src/main/java/google/registry/batch/CloudTasksUtils.java

@@ -49,6 +49,7 @@ import google.registry.util.CollectionUtils;
 import google.registry.util.GoogleCredentialsBundle;
 import google.registry.util.RegistryEnvironment;
 import google.registry.util.Retrier;
+import jakarta.inject.Inject;
 import java.io.Serial;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
@@ -58,7 +59,6 @@ import java.util.Random;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import javax.inject.Inject;
 import org.joda.time.Duration;
 
 /** Utilities for dealing with Cloud Tasks. */

core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java

@@ -42,10 +42,10 @@ import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.request.lock.LockHandler;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java

@@ -42,7 +42,7 @@ import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
 import google.registry.util.RegistryEnvironment;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Hard deletes load-test Contacts, Hosts, their subordinate history entries, and the associated

core/src/main/java/google/registry/batch/DeleteProberDataAction.java

@@ -46,11 +46,11 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.util.RegistryEnvironment;
+import jakarta.inject.Inject;
 import jakarta.persistence.TypedQuery;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java

@@ -41,9 +41,9 @@ import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
 import google.registry.util.RegistryEnvironment;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/batch/RelockDomainAction.java

@@ -42,10 +42,10 @@ import google.registry.request.auth.Auth;
 import google.registry.tools.DomainLockUtils;
 import google.registry.util.DateTimeUtils;
 import google.registry.util.EmailMessage;
+import jakarta.inject.Inject;
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.Duration;
 
 /** Task that re-locks a previously-Registry-Locked domain after a predetermined period of time. */
@@ -68,14 +68,14 @@ public class RelockDomainAction implements Runnable {
 
   private static final String RELOCK_SUCCESS_EMAIL_TEMPLATE =
       """
-          The domain %s was successfully re-locked.
+      The domain %s was successfully re-locked.
 
-          Please contact support at %s if you have any questions.""";
+      Please contact support at %s if you have any questions.""";
   private static final String RELOCK_NON_RETRYABLE_FAILURE_EMAIL_TEMPLATE =
       """
-          There was an error when automatically re-locking %s. Error message: %s
+      There was an error when automatically re-locking %s. Error message: %s
 
-          Please contact support at %s if you have any questions.""";
+      Please contact support at %s if you have any questions.""";
   private static final String RELOCK_TRANSIENT_FAILURE_EMAIL_TEMPLATE =
       "There was an unexpected error when automatically re-locking %s. We will continue retrying "
           + "the lock for five hours. Please contact support at %s if you have any questions";

core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java

@@ -34,7 +34,7 @@ import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
 import google.registry.util.RegistryEnvironment;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Starts a Dataflow pipeline that resaves all EPP resources projected to the current time.

core/src/main/java/google/registry/batch/ResaveEntityAction.java

@@ -30,8 +30,8 @@ import google.registry.request.Action.Method;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java

@@ -39,10 +39,10 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.EmailMessage;
+import jakarta.inject.Inject;
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.joda.time.format.DateTimeFormat;

core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java

@@ -36,9 +36,9 @@ import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
 import google.registry.util.RegistryEnvironment;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java

@@ -53,10 +53,10 @@ import google.registry.model.tld.Tld;
 import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.util.Clock;
 import google.registry.util.SystemClock;
+import jakarta.inject.Singleton;
 import java.io.Serializable;
 import java.util.Optional;
 import java.util.Set;
-import javax.inject.Singleton;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.KvCoder;

core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java

@@ -28,8 +28,8 @@ import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.privileges.secretmanager.SecretManagerModule;
 import google.registry.util.UtilsModule;
+import jakarta.inject.Singleton;
 import javax.annotation.Nullable;
-import javax.inject.Singleton;
 
 /** Component that provides everything needed on a Pipeline worker. */
 @Singleton

core/src/main/java/google/registry/beam/rde/RdePipeline.java

@@ -69,11 +69,11 @@ import google.registry.rde.PendingDeposit.PendingDepositCoder;
 import google.registry.rde.RdeMarshaller;
 import google.registry.util.UtilsModule;
 import google.registry.xml.ValidationMode;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashSet;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.KvCoder;

core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java

@@ -32,8 +32,8 @@ import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.persistence.VKey;
 import google.registry.util.Retrier;
 import google.registry.util.UtilsModule;
+import jakarta.inject.Singleton;
 import java.io.Serializable;
-import javax.inject.Singleton;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.KvCoder;

core/src/main/java/google/registry/bigquery/BigqueryConnection.java

@@ -62,13 +62,13 @@ import google.registry.util.NonFinalForTesting;
 import google.registry.util.Sleeper;
 import google.registry.util.SqlTemplate;
 import google.registry.util.SystemSleeper;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/bigquery/CheckedBigquery.java

@@ -26,11 +26,11 @@ import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableSchema;
 import com.google.common.collect.ImmutableList;
 import com.google.common.flogger.FluentLogger;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.inject.Inject;
 
 /** Wrapper of {@link Bigquery} with validation helpers. */
 public class CheckedBigquery {

core/src/main/java/google/registry/bsa/BlockListFetcher.java

@@ -26,6 +26,7 @@ import google.registry.bsa.api.BsaException;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.request.UrlConnectionService;
 import google.registry.util.Retrier;
+import jakarta.inject.Inject;
 import java.io.BufferedInputStream;
 import java.io.Closeable;
 import java.io.IOException;
@@ -33,7 +34,6 @@ import java.io.InputStream;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.function.BiConsumer;
-import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 
 /** Fetches data from the BSA API. */

core/src/main/java/google/registry/bsa/BsaDiffCreator.java

@@ -37,12 +37,12 @@ import google.registry.bsa.api.BlockOrder.OrderType;
 import google.registry.bsa.persistence.DownloadSchedule;
 import google.registry.bsa.persistence.DownloadSchedule.CompletedJob;
 import google.registry.tldconfig.idn.IdnTableEnum;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.inject.Inject;
 
 /** Creates diffs between the most recent download and the previous one. */
 class BsaDiffCreator {

core/src/main/java/google/registry/bsa/BsaDownloadAction.java

@@ -45,10 +45,10 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.inject.Inject;
 
 @Action(
     service = GaeService.BSA,

core/src/main/java/google/registry/bsa/BsaEmailSender.java

@@ -17,8 +17,8 @@ package google.registry.bsa;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.groups.GmailClient;
 import google.registry.util.EmailMessage;
+import jakarta.inject.Inject;
 import jakarta.mail.internet.InternetAddress;
-import javax.inject.Inject;
 
 /** Sends BSA-related email notifications. */
 class BsaEmailSender {

core/src/main/java/google/registry/bsa/BsaLock.java

@@ -16,8 +16,8 @@ package google.registry.bsa;
 
 import google.registry.config.RegistryConfig.Config;
 import google.registry.request.lock.LockHandler;
+import jakarta.inject.Inject;
 import java.util.concurrent.Callable;
-import javax.inject.Inject;
 import org.joda.time.Duration;
 
 /** Helper for guarding all BSA related work with a common lock. */

core/src/main/java/google/registry/bsa/BsaRefreshAction.java

@@ -36,9 +36,9 @@ import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.BatchedStreams;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.inject.Inject;
 import org.joda.time.Duration;
 
 @Action(

core/src/main/java/google/registry/bsa/BsaValidateAction.java

@@ -59,10 +59,10 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/bsa/GcsClient.java

@@ -26,6 +26,7 @@ import google.registry.bsa.api.UnblockableDomain;
 import google.registry.bsa.api.UnblockableDomainChange;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.gcs.GcsUtils;
+import jakarta.inject.Inject;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -36,7 +37,6 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.stream.Stream;
-import javax.inject.Inject;
 
 /** Stores and accesses BSA-related data, including original downloads and processed data. */
 public class GcsClient {

core/src/main/java/google/registry/bsa/IdnChecker.java

@@ -28,7 +28,7 @@ import google.registry.model.tld.Tlds;
 import google.registry.tldconfig.idn.IdnLabelValidator;
 import google.registry.tldconfig.idn.IdnTableEnum;
 import google.registry.util.Clock;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java

@@ -45,6 +45,7 @@ import google.registry.request.Action;
 import google.registry.request.Action.GaeService;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import jakarta.persistence.TypedQuery;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -53,7 +54,6 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Optional;
 import java.util.zip.GZIPOutputStream;
-import javax.inject.Inject;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;

core/src/main/java/google/registry/bsa/api/BsaCredential.java

@@ -27,13 +27,13 @@ import google.registry.keyring.api.Keyring;
 import google.registry.request.UrlConnectionService;
 import google.registry.request.UrlConnectionUtils;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.Map;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 import org.joda.time.Duration;
 import org.joda.time.Instant;

core/src/main/java/google/registry/bsa/api/BsaReportSender.java

@@ -26,11 +26,11 @@ import google.registry.config.RegistryConfig.Config;
 import google.registry.request.UrlConnectionService;
 import google.registry.request.UrlConnectionUtils;
 import google.registry.util.Retrier;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.security.GeneralSecurityException;
-import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 
 /**

core/src/main/java/google/registry/bsa/persistence/DownloadScheduler.java

@@ -27,9 +27,9 @@ import com.google.common.collect.ImmutableList;
 import google.registry.bsa.persistence.DownloadSchedule.CompletedJob;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Objects;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.Duration;
 
 /**

core/src/main/java/google/registry/bsa/persistence/RefreshScheduler.java

@@ -19,8 +19,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /** Assigns work for each cron invocation of domain refresh job. */

core/src/main/java/google/registry/config/CredentialModule.java

@@ -24,13 +24,13 @@ import dagger.Provides;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.util.Clock;
 import google.registry.util.GoogleCredentialsBundle;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.time.Duration;
-import javax.inject.Qualifier;
-import javax.inject.Singleton;
 
 /** Dagger module that provides all {@link GoogleCredentials} used in the application. */
 @Module

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -40,6 +40,9 @@ import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.request.Action.GkeService;
 import google.registry.util.RegistryEnvironment;
 import google.registry.util.YamlUtils;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Singleton;
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
 import java.lang.annotation.Documented;
@@ -51,9 +54,6 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import javax.inject.Named;
-import javax.inject.Qualifier;
-import javax.inject.Singleton;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeConstants;
 import org.joda.time.Duration;

core/src/main/java/google/registry/cron/TldFanoutAction.java

@@ -48,9 +48,9 @@ import google.registry.request.RequestParameters;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.RegistryEnvironment;
+import jakarta.inject.Inject;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.inject.Inject;
 
 /**
  * Action for fanning out cron tasks shared by TLD.

core/src/main/java/google/registry/dns/DnsMetrics.java

@@ -25,7 +25,7 @@ import com.google.monitoring.metrics.IncrementableMetric;
 import com.google.monitoring.metrics.LabelDescriptor;
 import com.google.monitoring.metrics.MetricRegistryImpl;
 import google.registry.util.RegistryEnvironment;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.joda.time.Duration;
 
 /** DNS instrumentation. */

core/src/main/java/google/registry/dns/DnsWriterProxy.java

@@ -20,8 +20,8 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.flogger.FluentLogger;
 import google.registry.dns.writer.DnsWriter;
 import google.registry.model.tld.Tld;
+import jakarta.inject.Inject;
 import java.util.Map;
-import javax.inject.Inject;
 
 /** Proxy for retrieving {@link DnsWriter} implementations. */
 public final class DnsWriterProxy {

core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java

@@ -63,11 +63,11 @@ import google.registry.request.lock.LockHandler;
 import google.registry.util.Clock;
 import google.registry.util.DomainNameUtils;
 import google.registry.util.EmailMessage;
+import jakarta.inject.Inject;
 import jakarta.mail.internet.InternetAddress;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/dns/ReadDnsRefreshRequestsAction.java

@@ -49,9 +49,9 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Collection;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/dns/RefreshDnsAction.java

@@ -32,7 +32,7 @@ import google.registry.request.HttpException.NotFoundException;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /** Action that manually triggers refresh of DNS information. */
 @Action(

core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java

@@ -30,7 +30,7 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.joda.time.DateTime;
 
 @Action(

core/src/main/java/google/registry/dns/writer/DnsWriterZone.java

@@ -14,8 +14,8 @@
 
 package google.registry.dns.writer;
 
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Documented;
-import javax.inject.Qualifier;
 
 /** Dagger qualifier for the fully-qualified zone name that's being updated. */
 @Qualifier

core/src/main/java/google/registry/dns/writer/VoidDnsWriter.java

@@ -15,9 +15,9 @@
 package google.registry.dns.writer;
 
 import com.google.common.flogger.FluentLogger;
+import jakarta.inject.Inject;
 import java.util.HashSet;
 import java.util.Set;
-import javax.inject.Inject;
 
 /**
  * {@link DnsWriter} that doesn't actually update records in a DNS server.

core/src/main/java/google/registry/dns/writer/VoidDnsWriterModule.java

@@ -20,7 +20,7 @@ import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import dagger.multibindings.IntoSet;
 import dagger.multibindings.StringKey;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 /** Dagger module that disables DNS updates. */
 @Module

core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java

@@ -45,6 +45,8 @@ import google.registry.model.tld.Tlds;
 import google.registry.util.Clock;
 import google.registry.util.Concurrent;
 import google.registry.util.Retrier;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.io.IOException;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -57,8 +59,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Named;
 import org.joda.time.Duration;
 
 /**

core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java

@@ -26,8 +26,8 @@ import google.registry.config.CredentialModule.ApplicationDefaultCredential;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.dns.writer.DnsWriter;
 import google.registry.util.GoogleCredentialsBundle;
+import jakarta.inject.Named;
 import java.util.Optional;
-import javax.inject.Named;
 
 /** Dagger module for Google Cloud DNS service connection objects. */
 @Module

core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java

@@ -20,6 +20,7 @@ import static com.google.common.base.Verify.verify;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Ints;
 import google.registry.config.RegistryConfig.Config;
+import jakarta.inject.Inject;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,7 +28,6 @@ import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
-import javax.inject.Inject;
 import javax.net.SocketFactory;
 import org.joda.time.Duration;
 import org.xbill.DNS.Message;

core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java

@@ -34,12 +34,12 @@ import google.registry.model.host.Host;
 import google.registry.model.tld.Tld;
 import google.registry.model.tld.Tlds;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.Duration;
 import org.xbill.DNS.AAAARecord;
 import org.xbill.DNS.ARecord;

core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java

@@ -21,7 +21,7 @@ import dagger.multibindings.IntoMap;
 import dagger.multibindings.IntoSet;
 import dagger.multibindings.StringKey;
 import google.registry.dns.writer.DnsWriter;
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.net.SocketFactory;
 
 /** Dagger module that provides a DnsUpdateWriter. */

core/src/main/java/google/registry/export/DriveModule.java

@@ -24,7 +24,7 @@ import google.registry.config.RegistryConfig.Config;
 import google.registry.config.RegistryConfig.ConfigModule;
 import google.registry.storage.drive.DriveConnection;
 import google.registry.util.GoogleCredentialsBundle;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /** Dagger module for Google {@link Drive} service connection objects. */
 @Module

core/src/main/java/google/registry/export/ExportDomainListsAction.java

@@ -39,12 +39,12 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.auth.Auth;
 import google.registry.storage.drive.DriveConnection;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.time.Instant;
 import java.util.List;
-import javax.inject.Inject;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.TupleTransformer;
 import org.joda.time.DateTime;

core/src/main/java/google/registry/export/ExportPremiumTermsAction.java

@@ -39,10 +39,10 @@ import google.registry.request.RequestParameters;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.storage.drive.DriveConnection;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.SortedSet;
-import javax.inject.Inject;
 
 /** Action that exports the premium terms list for a TLD to Google Drive. */
 @Action(

core/src/main/java/google/registry/export/ExportReservedTermsAction.java

@@ -31,7 +31,7 @@ import google.registry.request.RequestParameters;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.storage.drive.DriveConnection;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /** Action that exports the publicly viewable reserved terms list for a TLD to Google Drive. */
 @Action(

core/src/main/java/google/registry/export/ExportUtils.java

@@ -20,9 +20,9 @@ import google.registry.model.tld.Tld;
 import google.registry.model.tld.label.ReservedList;
 import google.registry.model.tld.label.ReservedList.ReservedListEntry;
 import google.registry.model.tld.label.ReservedListDao;
+import jakarta.inject.Inject;
 import java.util.Set;
 import java.util.TreeSet;
-import javax.inject.Inject;
 
 /** Container class for exported-related utility methods. */
 public final class ExportUtils {

core/src/main/java/google/registry/export/SyncGroupMembersAction.java

@@ -39,6 +39,7 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Retrier;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +47,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 
 /**
  * Action that syncs changes to {@link RegistrarPoc} entities with Google Groups.

core/src/main/java/google/registry/export/sheet/SheetSynchronizer.java

@@ -26,10 +26,10 @@ import com.google.api.services.sheets.v4.model.ValueRange;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.flogger.FluentLogger;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
 
 /** Generic data synchronization utility for Google Spreadsheets. */
 class SheetSynchronizer {

core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java

@@ -39,11 +39,11 @@ import google.registry.model.registrar.RegistrarPoc;
 import google.registry.model.registrar.RegistrarPocBase;
 import google.registry.util.Clock;
 import google.registry.util.DateTimeUtils;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java

@@ -29,11 +29,11 @@ import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.request.lock.LockHandler;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 import org.joda.time.Duration;
 
 /**

core/src/main/java/google/registry/flows/CheckApiAction.java

@@ -60,10 +60,10 @@ import google.registry.request.Parameter;
 import google.registry.request.RequestParameters;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
+import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/CheckApiMetrics.java

@@ -24,7 +24,7 @@ import com.google.monitoring.metrics.MetricRegistryImpl;
 import google.registry.monitoring.whitebox.CheckApiMetric;
 import google.registry.monitoring.whitebox.CheckApiMetric.Availability;
 import google.registry.monitoring.whitebox.CheckApiMetric.Tier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /** Helpers for updating domain check metrics. */
 public class CheckApiMetrics {

core/src/main/java/google/registry/flows/EppController.java

@@ -32,8 +32,8 @@ import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.eppoutput.Result;
 import google.registry.model.eppoutput.Result.Code;
 import google.registry.monitoring.whitebox.EppMetric;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.json.simple.JSONValue;
 
 /**

core/src/main/java/google/registry/flows/EppMetrics.java

@@ -22,7 +22,7 @@ import com.google.monitoring.metrics.IncrementableMetric;
 import com.google.monitoring.metrics.LabelDescriptor;
 import com.google.monitoring.metrics.MetricRegistryImpl;
 import google.registry.monitoring.whitebox.EppMetric;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /** EPP Instrumentation. */
 public class EppMetrics {

core/src/main/java/google/registry/flows/EppRequestHandler.java

@@ -26,7 +26,7 @@ import com.google.common.net.MediaType;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.request.Response;
 import google.registry.util.ProxyHttpHeaders;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /** Handle an EPP request and response. */
 public class EppRequestHandler {

core/src/main/java/google/registry/flows/EppTlsAction.java

@@ -19,8 +19,8 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Action.Method;
 import google.registry.request.Payload;
 import google.registry.request.auth.Auth;
+import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpSession;
-import javax.inject.Inject;
 
 /**
  * Establishes a transport for EPP+TLS over HTTP. All commands and responses are EPP XML according

core/src/main/java/google/registry/flows/EppToolAction.java

@@ -26,8 +26,8 @@ import google.registry.request.Action.GaeService;
 import google.registry.request.Action.Method;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
+import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
-import javax.inject.Inject;
 
 /** Runs EPP commands directly without logging in, verifying an XSRF token from the tool. */
 @Action(

core/src/main/java/google/registry/flows/ExtensionManager.java

@@ -34,8 +34,8 @@ import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.domain.superuser.SuperuserExtension;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppinput.EppInput.CommandExtension;
+import jakarta.inject.Inject;
 import java.util.Set;
-import javax.inject.Inject;
 
 /**
  * Helper to validate extensions on an EPP command.

core/src/main/java/google/registry/flows/FlowModule.java

@@ -39,9 +39,9 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.IsolationLevel;
 import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.persistence.transaction.JpaTransactionManager;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Documented;
 import java.util.Optional;
-import javax.inject.Qualifier;
 
 /** Module to choose and instantiate an EPP flow. */
 @Module

core/src/main/java/google/registry/flows/FlowReporter.java

@@ -28,8 +28,8 @@ import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppinput.EppInput;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.json.simple.JSONValue;
 
 /** Reporter used by {@link FlowRunner} to record flow execution data for reporting. */

core/src/main/java/google/registry/flows/FlowRunner.java

@@ -29,9 +29,9 @@ import google.registry.model.eppoutput.EppOutput;
 import google.registry.monitoring.whitebox.EppMetric;
 import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import google.registry.persistence.transaction.JpaTransactionManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Provider;
 
 /** Run a flow, either transactionally or not, with logging and retrying as needed. */
 public class FlowRunner {

core/src/main/java/google/registry/flows/FlowScope.java

@@ -14,12 +14,12 @@
 
 package google.registry.flows;
 
+import jakarta.inject.Scope;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.inject.Scope;
 
 /**
  * Dagger annotation for flow-scoped components.

core/src/main/java/google/registry/flows/ServerTridProviderImpl.java

@@ -17,10 +17,10 @@ package google.registry.flows;
 import static com.google.common.primitives.Longs.BYTES;
 
 import com.google.common.io.BaseEncoding;
+import jakarta.inject.Inject;
 import java.nio.ByteBuffer;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
-import javax.inject.Inject;
 
 /** A server Trid provider that generates globally incrementing UUIDs. */
 public class ServerTridProviderImpl implements ServerTridProvider {

core/src/main/java/google/registry/flows/TlsCredentials.java

@@ -34,11 +34,11 @@ import google.registry.request.Header;
 import google.registry.util.CidrAddressBlock;
 import google.registry.util.ProxyHttpHeaders;
 import google.registry.util.RegistryEnvironment;
+import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
 import java.security.MessageDigest;
 import java.util.Optional;
-import javax.inject.Inject;
 
 /**
  * Container and validation for TLS certificate and IP-allow-listing.

core/src/main/java/google/registry/flows/certs/CertificateChecker.java

@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSortedMap;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.util.Clock;
 import google.registry.util.DateTimeUtils;
+import jakarta.inject.Inject;
 import java.io.ByteArrayInputStream;
 import java.io.StringWriter;
 import java.security.PublicKey;
@@ -32,7 +33,6 @@ import java.security.cert.X509Certificate;
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPublicKey;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
 import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
 import org.bouncycastle.jce.ECNamedCurveTable;
 import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;

core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java

@@ -34,7 +34,7 @@ import google.registry.model.eppoutput.CheckData.ContactCheckData;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.util.Clock;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * An EPP flow that checks whether a contact can be provisioned.

core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java

@@ -40,7 +40,7 @@ import google.registry.model.eppoutput.CreateData.ContactCreateData;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java

@@ -43,8 +43,8 @@ import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.reporting.HistoryEntry.Type;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java

@@ -34,8 +34,8 @@ import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java

@@ -41,8 +41,8 @@ import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.transfer.TransferStatus;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java

@@ -41,8 +41,8 @@ import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.transfer.TransferStatus;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java

@@ -32,8 +32,8 @@ import google.registry.model.eppcommon.AuthInfo;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 
 /**
  * An EPP flow that queries a pending transfer on a contact.

core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java

@@ -40,8 +40,8 @@ import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.transfer.TransferStatus;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java

@@ -49,8 +49,8 @@ import google.registry.model.reporting.HistoryEntry.HistoryEntryId;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.transfer.ContactTransferData;
 import google.registry.model.transfer.TransferStatus;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java

@@ -47,9 +47,9 @@ import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppinput.ResourceCommand;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
+import jakarta.inject.Inject;
 import java.util.Optional;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java

@@ -89,13 +89,13 @@ import google.registry.model.tld.label.ReservationType;
 import google.registry.persistence.VKey;
 import google.registry.pricing.PricingEngineProxy;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java

@@ -48,10 +48,10 @@ import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.tld.Tld;
 import google.registry.model.tmch.ClaimsListDao;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java

@@ -118,8 +118,8 @@ import google.registry.model.tld.label.ReservationType;
 import google.registry.model.tmch.ClaimsList;
 import google.registry.model.tmch.ClaimsListDao;
 import google.registry.tmch.LordnTaskUtils.LordnPhase;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java

@@ -95,11 +95,11 @@ import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.tld.Tld;
 import google.registry.model.tld.Tld.TldType;
 import google.registry.model.transfer.TransferStatus;
+import jakarta.inject.Inject;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;

core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java

@@ -31,13 +31,13 @@ import google.registry.model.smd.SignedMark;
 import google.registry.model.smd.SignedMarkRevocationList;
 import google.registry.tmch.TmchXmlSignature;
 import google.registry.tmch.TmchXmlSignature.CertificateSignatureException;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.SignatureException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.CertificateRevokedException;
-import javax.inject.Inject;
 import javax.xml.crypto.MarshalException;
 import javax.xml.crypto.dsig.XMLSignatureException;
 import javax.xml.parsers.ParserConfigurationException;

core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java

@@ -54,8 +54,8 @@ import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.util.Clock;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**

core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java

@@ -40,10 +40,10 @@ import google.registry.model.domain.token.AllocationToken.RegistrationBehavior;
 import google.registry.model.domain.token.AllocationToken.TokenBehavior;
 import google.registry.model.pricing.PremiumPricingEngine.DomainPrices;
 import google.registry.model.tld.Tld;
+import jakarta.inject.Inject;
 import java.math.RoundingMode;
 import java.util.Optional;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;

core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java

@@ -85,8 +85,8 @@ import google.registry.model.reporting.DomainTransactionRecord.TransactionReport
 import google.registry.model.reporting.HistoryEntry.HistoryEntryId;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.tld.Tld;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;

core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java

@@ -68,8 +68,8 @@ import google.registry.model.reporting.DomainTransactionRecord.TransactionReport
 import google.registry.model.reporting.HistoryEntry.HistoryEntryId;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.tld.Tld;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 

core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java

@@ -68,8 +68,8 @@ import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.tld.Tld;
 import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 

core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java

@@ -50,8 +50,8 @@ import google.registry.model.reporting.HistoryEntry.HistoryEntryId;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.tld.Tld;
 import google.registry.model.transfer.TransferStatus;
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /**