Change javax.inject to jakarta.inject, get it compiling

build.gradle

@@ -112,17 +112,17 @@ ext.versions = [
         //------------3rd-party------------
         aws               : '2.17.253',
         curator           : '4.2.0', // Curator 4 works with ZK 3.4.x in soft compatibility mode, i.e. you must exlude its dep on ZK and explicitly add one for 3.4.x
-        dropwizard        : '4.0.3', // used to set the dropwizard-bom version, that controls lots of dependency versions
+        dropwizard        : '4.0.4', // used to set the dropwizard-bom version, that controls lots of dependency versions
         elasticsearch     : '7.17.14',
         httpcore          : '4.4.16', // Transient dependency of Elasticsearch
-        guice5            : '5.1.0',
+        guice             : '7.0.0',
         gwt               : '2.10.0',
         hikari            : '5.0.0',
         jackson_swagger   : '2.11.1', // Specific version of jackson for use with the swagger plugin
         jersey            : '2.35', // This is a fudge. We should get it from the dropwiz bom but dropwizard-jersey pulls in 2.33 and metrics-jersey pulls in 2.35. IJ seems to get confused and put both on the classpath. See dependencySubstitution below.
         jmh               : '1.35',
         jooq              : '3.16.4',
-        junit_jupiter     : '5.8.2',
+        junit_jupiter     : '5.10.1',
         kafka             : '2.2.1', // CDH 6.3 uses kafka 2.2.1
         lucene            : '5.5.3',
         swagger           : '2.1.12',
@@ -184,16 +184,16 @@ ext.libs = [
         elasticsearch_rest_client           : "org.elasticsearch.client:elasticsearch-rest-client:$versions.elasticsearch",
         elasticsearch                       : "org.elasticsearch:elasticsearch:$versions.elasticsearch",
         elasticsearch_core                  : "org.elasticsearch:elasticsearch-core:$versions.elasticsearch",
-        fast_infoset                        : "com.sun.xml.fastinfoset:FastInfoset:1.2.12",
+        fast_infoset                        : "com.sun.xml.fastinfoset:FastInfoset:1.2.18",
         flyway_core                         : "org.flywaydb:flyway-core:7.5.3",
         gin                                 : "com.google.gwt.inject:gin:2.1.2",
         guava                               : "com.google.guava:guava", // version controlled by dropwizard-dependencies
-        guice3                              : "com.google.inject:guice:3.0",
-        guice5                              : "com.google.inject:guice:$versions.guice5",
-        guice_assistedinject                : "com.google.inject.extensions:guice-assistedinject:$versions.guice5",
+        guice__gwt                          : "com.google.inject:guice:3.0",
+        guice                               : "com.google.inject:guice:$versions.guice",
+        guice_assistedinject                : "com.google.inject.extensions:guice-assistedinject:$versions.guice",
         guice_extension                     : "name.falgout.jeffrey.testing.junit5:guice-extension:1.2.1",
-        guice_multibindings                 : "com.google.inject.extensions:guice-multibindings:$versions.guice5",
-        guice_grapher                       : "com.google.inject.extensions:guice-grapher:$versions.guice5",
+        guice_multibindings                 : "com.google.inject.extensions:guice-multibindings:$versions.guice",
+        guice_grapher                       : "com.google.inject.extensions:guice-grapher:$versions.guice",
         gwt_dev                             : "org.gwtproject:gwt-dev:$versions.gwt",
         gwt_servlet                         : "org.gwtproject:gwt-servlet:$versions.gwt",
         gwt_user                            : "org.gwtproject:gwt-user:$versions.gwt",
@@ -223,8 +223,8 @@ ext.libs = [
         java_jwt                            : "com.auth0:java-jwt:3.1.0",
         javax_annotation_api                : "javax.annotation:javax.annotation-api:1.3.2",
         javassist                           : "org.javassist:javassist", // version controlled by dropwizard-dependencies
-        //javax_inject                        : "javax.inject:javax.inject:1",
-        javax_inject                        : "jakarta.inject:jakarta.inject-api:2.0.1",
+        javax_inject__gwt                   : "javax.inject:javax.inject:1",
+        jakarta_inject                      : "jakarta.inject:jakarta.inject-api:2.0.1",
         jaxb_api                            : "jakarta.xml.bind:jakarta.xml.bind-api:4.0.1",
         jaxb_api__gwt                       : "javax.xml.bind:jaxb-api:2.3.1",//"jakarta.xml.bind:jakarta.xml.bind-api:3.0.1", // Using beta versions of jaxb libs as they resolve the split pkg problem between jaxb-core and jaxb-runtime
         jaxb_impl                           : "com.sun.xml.bind:jaxb-impl:4.0.4",

stroom-activity/stroom-activity-impl-db/build.gradle

@@ -10,11 +10,11 @@ dependencies {
     implementation project(':stroom-util')
     implementation project(':stroom-util-shared')
 
-    implementation libs.guice5
+    implementation libs.guice
     implementation libs.jackson_annotations
     implementation libs.jackson_core
     implementation libs.jackson_databind
-    implementation libs.javax_inject
+    implementation libs.jakarta_inject
     implementation libs.jooq
     implementation libs.slf4j_api
 

stroom-activity/stroom-activity-impl-db/src/main/java/stroom/activity/impl/db/ActivityDaoImpl.java

@@ -31,7 +31,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import static stroom.activity.impl.db.jooq.tables.Activity.ACTIVITY;
 

stroom-activity/stroom-activity-impl/build.gradle

@@ -8,12 +8,12 @@ dependencies {
     implementation project(':stroom-security:stroom-security-api')
     implementation project(':stroom-util-shared')
     implementation project(':stroom-util')
-    
+
     implementation libs.eventLogging
     implementation libs.guava
-    implementation libs.guice5
+    implementation libs.guice
     implementation libs.jakarta_servlet_api
-    implementation libs.javax_inject
+    implementation libs.jakarta_inject
     implementation libs.jaxb_api
     implementation libs.restygwt
     implementation libs.slf4j_api

stroom-activity/stroom-activity-impl/src/main/java/stroom/activity/impl/ActivityResourceImpl.java

@@ -26,8 +26,8 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 @AutoLogged
 class ActivityResourceImpl implements ActivityResource {

stroom-activity/stroom-activity-impl/src/main/java/stroom/activity/impl/ActivityServiceImpl.java

@@ -41,7 +41,7 @@
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ActivityServiceImpl implements ActivityService {
 

stroom-activity/stroom-activity-impl/src/main/java/stroom/activity/impl/CurrentActivityImpl.java

@@ -26,7 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class CurrentActivityImpl implements CurrentActivity {
 

stroom-activity/stroom-activity-mock/build.gradle

@@ -4,6 +4,6 @@ dependencies {
     implementation project(':stroom-activity:stroom-activity-api')
     implementation project(':stroom-core-shared')
 
-    implementation libs.guice5
+    implementation libs.guice
     implementation libs.jackson_annotations
 }

stroom-analytics/stroom-analytics-impl-db/build.gradle

@@ -23,12 +23,12 @@ dependencies {
 
     implementation libs.dropwizard_metrics_healthchecks
     implementation libs.flyway_core
-    implementation libs.guice5
+    implementation libs.guice
     implementation libs.hikari
     implementation libs.jackson_annotations
     implementation libs.jackson_core
     implementation libs.jackson_databind
-    implementation libs.javax_inject
+    implementation libs.jakarta_inject
     implementation libs.jaxb_api
     implementation libs.jooq
     implementation libs.slf4j_api

stroom-analytics/stroom-analytics-impl-db/src/main/java/stroom/analytics/impl/db/AnalyticTrackerDaoImpl.java

@@ -11,8 +11,8 @@
 import org.jooq.Record;
 
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import static stroom.analytics.impl.db.jooq.tables.AnalyticTracker.ANALYTIC_TRACKER;
 

stroom-analytics/stroom-analytics-impl/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 //    implementation project(':stroom-view:stroom-view-impl')
     implementation project(':stroom-view:stroom-view-api')
 
-    implementation libs.guice5
+    implementation libs.guice
     implementation libs.jackson_annotations
     implementation libs.jakarta_validation_api
     implementation libs.jaxb_api

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticDataShardResourceImpl.java

@@ -40,8 +40,8 @@
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.Status;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 @AutoLogged(OperationType.UNLOGGED)
 class AnalyticDataShardResourceImpl implements AnalyticDataShardResource {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticDataStores.java

@@ -64,9 +64,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class AnalyticDataStores implements HasResultStoreInfo {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticErrorWriter.java

@@ -16,7 +16,7 @@
 import org.slf4j.MarkerFactory;
 
 import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @PipelineScoped
 public class AnalyticErrorWriter {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticErrorWritingExecutor.java

@@ -5,8 +5,8 @@
 import stroom.task.api.TerminateHandlerFactory;
 
 import java.util.function.Consumer;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 class AnalyticErrorWritingExecutor {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticHelper.java

@@ -23,8 +23,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 public class AnalyticHelper {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticProcessResourceImpl.java

@@ -21,8 +21,8 @@
 import stroom.event.logging.rs.api.AutoLogged;
 import stroom.event.logging.rs.api.AutoLogged.OperationType;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 @AutoLogged(OperationType.UNLOGGED)
 class AnalyticProcessResourceImpl implements AnalyticProcessResource {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticRuleSearchRequestHelper.java

@@ -11,7 +11,7 @@
 import stroom.query.common.v2.ExpressionContextFactory;
 import stroom.query.language.SearchRequestBuilder;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class AnalyticRuleSearchRequestHelper {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsModule.java

@@ -28,7 +28,7 @@
 
 import com.google.inject.AbstractModule;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import static stroom.job.api.Schedule.ScheduleType.PERIODIC;
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsNodeSearchTaskCreator.java

@@ -14,7 +14,7 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class AnalyticsNodeSearchTaskCreator implements NodeTaskCreator {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsNodeSearchTaskHandler.java

@@ -74,7 +74,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.LongAdder;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 
 class AnalyticsNodeSearchTaskHandler implements NodeSearchTaskHandler {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsNodeSearchTaskHandlerProvider.java

@@ -4,9 +4,9 @@
 import stroom.search.impl.NodeSearchTaskHandlerProvider;
 import stroom.search.impl.NodeSearchTaskType;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 class AnalyticsNodeSearchTaskHandlerProvider implements NodeSearchTaskHandlerProvider {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsSearchProvider.java

@@ -40,7 +40,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class AnalyticsSearchProvider implements SearchProvider, HasDataSourceDocRefs {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsStreamProcessor.java

@@ -48,7 +48,7 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.nio.channels.ClosedByInterruptException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class AnalyticsStreamProcessor {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DetectionConsumerFactory.java

@@ -6,8 +6,8 @@
 import stroom.analytics.shared.AnalyticNotificationStreamDestination;
 import stroom.analytics.shared.AnalyticRuleDoc;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 public class DetectionConsumerFactory {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DetectionConsumerProxy.java

@@ -24,8 +24,8 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 public class DetectionConsumerProxy implements ValuesConsumer, ProcessLifecycleAware {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DetectionWriter.java

@@ -12,7 +12,7 @@
 
 import java.util.List;
 import java.util.Locale;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class DetectionWriter implements DetectionConsumer {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DetectionsWriter.java

@@ -5,7 +5,7 @@
 import stroom.pipeline.writer.StreamAppender;
 import stroom.pipeline.writer.XMLWriter;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class DetectionsWriter implements DetectionConsumer {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/EmailSender.java

@@ -29,9 +29,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 import javax.mail.Message;
 
 @Singleton

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/NotificationStateService.java

@@ -4,7 +4,7 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class NotificationStateService {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/ScheduledQueryAnalyticExecutor.java

@@ -69,8 +69,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 public class ScheduledQueryAnalyticExecutor {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/StreamingAnalyticExecutor.java

@@ -59,9 +59,9 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class StreamingAnalyticExecutor {

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/TableBuilderAnalyticExecutor.java

@@ -77,9 +77,9 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class TableBuilderAnalyticExecutor {