[263] upgrade Quarkus to 3.6

build-parent/pom.xml

@@ -40,18 +40,18 @@
         <version.krausening>20</version.krausening>
         <version.plexus.archiver>3.6.0</version.plexus.archiver>
         <version.plugin.plugin>3.9.0</version.plugin.plugin>
-        <version.quarkus>2.8.3.Final</version.quarkus>
+        <version.quarkus>3.6.9</version.quarkus>
         <version.quarkus.plugin>${version.quarkus}</version.quarkus.plugin>
         <version.shade.plugin>3.2.4</version.shade.plugin>
-        <version.smallrye.config>1.12.0</version.smallrye.config>
-        <version.smallrye.graphql>1.6.0</version.smallrye.graphql>
-        <version.smallrye.reactive.messaging>3.15.0</version.smallrye.reactive.messaging>
+        <version.smallrye.config>3.9.1</version.smallrye.config>
+        <version.smallrye.graphql>2.9.1</version.smallrye.graphql>
+        <version.smallrye.reactive.messaging>4.24.0</version.smallrye.reactive.messaging>
         <version.orphedomos.plugin>0.10.1</version.orphedomos.plugin>
         <version.janino>3.0.8</version.janino>
-        <version.jackson>2.13.2</version.jackson>
-        <version.jclouds>2.5.0</version.jclouds>
+        <version.jackson>2.14.2</version.jackson>
+        <version.jclouds>2.6.0</version.jclouds>
         <version.maven.core>3.8.6</version.maven.core>
-        <version.mutiny>0.5.0</version.mutiny>
+        <version.mutiny>1.4.0</version.mutiny>
         <version.plexus.component>2.1.1</version.plexus.component>
         <version.postgresql>42.5.1</version.postgresql>
         <version.resteasy>4.7.7.Final</version.resteasy>
@@ -66,9 +66,15 @@
         <version.vault>5.1.0</version.vault>
         <version.awaitility>4.0.3</version.awaitility>
 
+        <!-- Java EE Dependencies -->
+        <version.jakarta.cdi>4.0.1</version.jakarta.cdi>
+        <version.jakarta.inject>2.0.1</version.jakarta.inject>
+        <version.jakarta.annotation>3.0.0</version.jakarta.annotation>
+        <version.javax.servlet>3.1.0</version.javax.servlet>
+
 <!--        Spark Default Dependencies.  See `spark-*` profiles below for alternative sets -->
         <version.spark>3.4.0</version.spark>
-        <version.scala>2.12.1</version.scala>
+        <version.scala>2.12.13</version.scala>
         <version.delta>2.4.0</version.delta>
         <version.elasticsearch>8.9.0</version.elasticsearch>
         <version.sedona>1.4.0</version.sedona>
@@ -78,8 +84,8 @@
         <version.neo4j>4.1.5_for_spark_3</version.neo4j>
         <version.aws.sdk.bundle>1.12.262</version.aws.sdk.bundle>
         <version.baton>1.1.1</version.baton>
-        <version.quarkus.cucumber>0.6.0</version.quarkus.cucumber>
-        <version.quarkus.cucumber.java>7.4.1</version.quarkus.cucumber.java>
+        <version.quarkus.cucumber>1.0.0</version.quarkus.cucumber>
+        <version.quarkus.cucumber.java>${version.cucumber}</version.quarkus.cucumber.java>
 
         <!-- io.fabric8:docker-maven-plugin -->
         <version.fabric8.docker.maven.plugin>0.45-tb-0.1.0</version.fabric8.docker.maven.plugin>
@@ -149,8 +155,14 @@
     </properties>
 
     <dependencyManagement>
-        <!-- NB: Why are these here and not with the other dependencies? -->
         <dependencies>
+            <!-- force upgrade jandex from 3.1.6 to 3.2.2 for compatibility with smalrye 4.24-->
+            <!-- NB: this will likely be unnecessary after upgrading to Quarkus 3.14+ -->
+            <dependency>
+                <groupId>io.smallrye</groupId>
+                <artifactId>jandex</artifactId>
+                <version>3.2.2</version>
+            </dependency>
             <dependency>
                 <groupId>net.masterthought</groupId>
                 <artifactId>cucumber-reporting</artifactId>

build-support/aissemble-enforcer-extension/pom.xml

@@ -41,6 +41,12 @@
             <artifactId>maven-core</artifactId>
             <version>${version.maven.core}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${version.javax.inject}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/cdi/SlackCdiContext.java

@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
 
 import com.boozallen.aissemble.alerting.slack.consumer.SlackConsumer;
 import com.boozallen.aissemble.core.cdi.CdiContext;

extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/consumer/SlackConsumer.java

@@ -10,7 +10,7 @@
  * #L%
  */
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.aeonbits.owner.KrauseningConfigFactory;
 import org.apache.commons.lang3.StringUtils;

extensions/extensions-alerting/extensions-alerting-teams/pom.xml

@@ -13,9 +13,29 @@
     <name>aiSSEMBLE::Extensions::Alerting::Teams</name>
     <description>The Alerting Teams module uses Microsoft Teams to send alerts</description>
 
-    <properties>
-        <version.smallrye.config.override>2.8.0</version.smallrye.config.override>
-    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-universe-bom</artifactId>
+                <version>${version.quarkus.plugin}</version>
+                <type>pom</type>
+                <scope>import</scope>
+                <exclusions>
+                    <!-- Quarkus 3.6 uses SmallRye Messaging 4.10, which is incompatible with 4.24. This causes issues for in-memory import -->
+                    <exclusion>
+                        <groupId>io.smallrye.reactive</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>io.smallrye.reactive</groupId>
+                <artifactId>smallrye-reactive-messaging-api</artifactId>
+                <version>${version.smallrye.reactive.messaging}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
@@ -29,7 +49,6 @@
         <dependency>
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config</artifactId>
-            <version>${version.smallrye.config.override}</version>
         </dependency>
         <dependency>
             <groupId>org.technologybrewery.krausening</groupId>
@@ -74,10 +93,6 @@
                     <groupId>org.jboss.slf4j</groupId>
                     <artifactId>slf4j-jboss-logmanager</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>io.smallrye.config</groupId>
-                    <artifactId>smallrye-config</artifactId>
-                </exclusion>
             </exclusions>
             <scope>test</scope>
         </dependency>

extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsClient.java

@@ -13,10 +13,10 @@
 import com.boozallen.aissemble.alerting.teams.models.CardMessage;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 @Path("/")
 @RegisterRestClient

extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsMessageService.java

@@ -13,8 +13,8 @@
 import com.boozallen.aissemble.alerting.teams.models.CardMessage;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 /**
  * Service to send messages to Microsoft Teams

extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/cdi/TeamsCdiContext.java

@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
 
 import com.boozallen.aissemble.alerting.teams.TeamsClient;
 import com.boozallen.aissemble.alerting.teams.TeamsMessageService;

extensions/extensions-alerting/extensions-alerting-teams/src/test/java/com/boozallen/aissemble/alerting/TeamsAlertingTest.java

@@ -10,7 +10,7 @@
  * #L%
  */
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

extensions/extensions-data-delivery/extensions-data-delivery-spark/pom.xml

@@ -53,6 +53,11 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
             <version>${version.jackson}</version>
         </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${version.scala}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_2.12</artifactId>
@@ -93,6 +98,13 @@
             <artifactId>foundation-messaging-java</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <!-- Spark hasn't migrated to Jakarta packages yet. Will need to shade it if we want to fully migrate. -->
+            <!-- See https://github.com/apache/incubator-hugegraph-toolchain/issues/464 -->
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${version.javax.servlet}</version>
+        </dependency>
 
         <dependency>
             <groupId>io.delta</groupId>

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/messaging/PipelineMessagingConfig.java

@@ -13,7 +13,7 @@
 import org.technologybrewery.krausening.Krausening;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/spark/objectstore/ObjectStoreValidator.java

@@ -13,8 +13,8 @@
  * #L%
  */
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.aeonbits.owner.KrauseningConfigFactory;
 import org.apache.hadoop.conf.Configuration;

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/MessagingConfigurationSteps.java

@@ -22,15 +22,15 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
-import io.smallrye.reactive.messaging.providers.connectors.InMemorySink;
-import io.smallrye.reactive.messaging.providers.connectors.InMemorySource;
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
+import io.smallrye.reactive.messaging.memory.InMemorySink;
+import io.smallrye.reactive.messaging.memory.InMemorySource;
 import org.apache.commons.lang.RandomStringUtils;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.jboss.weld.environment.se.WeldContainer;
 import org.junit.Assert;
 
-import javax.enterprise.inject.Any;
+import jakarta.enterprise.inject.Any;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/TestCdiContext.java

@@ -23,7 +23,7 @@
 import io.smallrye.config.inject.ConfigExtension;
 import io.smallrye.reactive.messaging.providers.MediatorFactory;
 import io.smallrye.reactive.messaging.providers.connectors.ExecutionHolder;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
 import io.smallrye.reactive.messaging.providers.connectors.WorkerPoolRegistry;
 import io.smallrye.reactive.messaging.providers.extension.ChannelProducer;
 import io.smallrye.reactive.messaging.providers.extension.HealthCenter;
@@ -34,7 +34,7 @@
 import io.smallrye.reactive.messaging.providers.impl.InternalChannelRegistry;
 import io.smallrye.reactive.messaging.providers.wiring.Wiring;
 
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
 import java.util.ArrayList;
 import java.util.List;
 

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOnlyTestStep.java

@@ -12,7 +12,7 @@
 
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class InOnlyTestStep extends AbstractTestStep {

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOutTestStep.java

@@ -13,7 +13,7 @@
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class InOutTestStep extends AbstractTestStep {

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/NoChannelTestStep.java

@@ -10,7 +10,7 @@
  * #L%
  */
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class NoChannelTestStep extends AbstractTestStep {

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OutOnlyTestStep.java

@@ -14,8 +14,8 @@
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 import org.eclipse.microprofile.reactive.messaging.OnOverflow;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class OutOnlyTestStep extends AbstractTestStep {

extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OverrideTestStep.java

@@ -13,7 +13,7 @@
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class OverrideTestStep extends AbstractTestStep {

extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml

@@ -22,11 +22,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <properties>
-        <!--    Overriding cucumber version to align with quarkus-cucumber -->
-        <version.cucumber>${version.quarkus.cucumber.java}</version.cucumber>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.technologybrewery.krausening</groupId>

extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducer.java

@@ -14,8 +14,8 @@
 import org.eclipse.microprofile.faulttolerance.Timeout;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.POST;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.POST;
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.CompletionStage;
 

extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducerService.java

@@ -12,8 +12,8 @@
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import javax.ws.rs.POST;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Produces;
 import java.util.concurrent.CompletionStage;
 
 /**

extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/LineageMessageHandler.java

@@ -17,8 +17,8 @@
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.spi.CDI;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.concurrent.CompletionStage;

extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/test/java/com/boozallen/aissemble/datalineage/consumer/MessageHandlingSteps.java

@@ -27,8 +27,8 @@
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.OnOverflow;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;

extensions/extensions-messaging/extensions-messaging-kafka/src/main/java/com/boozallen/aissemble/kafka/context/KafkaConnectorCdiContext.java

@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
 
 import com.boozallen.aissemble.core.cdi.CdiContext;