From e9c83d514059cff80e6a3ceb08154aeb20fa6d73 Mon Sep 17 00:00:00 2001 From: "Wilkins, Emily (Counterpointe Solutions)" <80470879+ewilkins-csi@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:20:53 -0500 Subject: [PATCH] [263] upgrade Quarkus to 3.6 --- build-parent/pom.xml | 34 ++-- .../aissemble-enforcer-extension/pom.xml | 6 + .../alerting/slack/cdi/SlackCdiContext.java | 2 +- .../slack/consumer/SlackConsumer.java | 2 +- .../extensions-alerting-teams/pom.xml | 31 ++- .../aissemble/alerting/teams/TeamsClient.java | 8 +- .../alerting/teams/TeamsMessageService.java | 4 +- .../alerting/teams/cdi/TeamsCdiContext.java | 2 +- .../aissemble/alerting/TeamsAlertingTest.java | 2 +- .../extensions-data-delivery-spark/pom.xml | 12 ++ .../messaging/PipelineMessagingConfig.java | 2 +- .../objectstore/ObjectStoreValidator.java | 4 +- .../delivery/MessagingConfigurationSteps.java | 8 +- .../aiops/data/delivery/TestCdiContext.java | 4 +- .../pipeline/steps/InOnlyTestStep.java | 2 +- .../pipeline/steps/InOutTestStep.java | 2 +- .../pipeline/steps/NoChannelTestStep.java | 2 +- .../pipeline/steps/OutOnlyTestStep.java | 4 +- .../pipeline/steps/OverrideTestStep.java | 2 +- .../pom.xml | 5 - .../datalineage/consumer/HttpProducer.java | 4 +- .../consumer/HttpProducerService.java | 4 +- .../consumer/LineageMessageHandler.java | 4 +- .../consumer/MessageHandlingSteps.java | 4 +- .../context/KafkaConnectorCdiContext.java | 2 +- .../quarkus/context/QuarkusCdiContext.java | 2 +- .../extensions-metadata-service/pom.xml | 29 +++ .../metadata/LoggingMetadataAPIService.java | 2 +- .../aiops/metadata/MetadataAPIType.java | 2 +- .../aiops/metadata/MetadataIngest.java | 4 +- .../aiops/metadata/MetadataService.java | 12 +- .../metadata/hive/HiveMetadataAPIService.java | 2 +- .../aiops/metadata/PipelineSteps.java | 4 +- .../aiops/metadata/SparkTestBaseHarness.java | 2 +- .../aiops/metadata/TestCdiContext.java | 4 +- .../src/test/resources/log4j2.xml | 25 +++ .../pom.xml | 11 +- .../service/PipelineInvocationAgent.java | 4 +- .../service/ValuesFileRegistry.java | 2 +- .../service/endpoint/HttpEndpoint.java | 16 +- .../service/endpoint/MessageEndpoint.java | 4 +- .../util/exec/HelmCommandExecutor.java | 2 +- .../service/ConfigurationSteps.java | 4 +- .../service/DeserializationSteps.java | 2 +- .../invocation/service/HelmCommandSteps.java | 4 +- .../service/ValuesDetectionSteps.java | 4 +- .../extensions-authzforce/pom.xml | 20 ++ .../security/authorization/Configurer.java | 33 +--- .../aissemble/security/PDPHelperResource.java | 12 +- foundation/foundation-alerting/pom.xml | 10 + .../alerting/core/AlertProducer.java | 4 +- .../alerting/core/consumer/AlertLogger.java | 2 +- foundation/foundation-archetype/pom.xml | 4 +- .../__rootArtifactId__-tests-java/pom.xml | 6 +- .../foundation-configuration-store/pom.xml | 6 - .../configuration/ConfigStoreInit.java | 8 +- .../dao/InMemoryPropertyDao.java | 2 +- .../dao/KrauseningPropertyDao.java | 2 +- .../configuration/dao/VaultPropertyDao.java | 2 +- .../webhook/ConfigMutatingWebhook.java | 16 +- .../configuration/service/ConfigService.java | 14 +- .../configuration/store/ConfigLoader.java | 6 +- .../store/LoadConfigurationsSteps.java | 4 +- .../aissemble/util/TestPropertyDao.java | 2 +- foundation/foundation-core-java/pom.xml | 79 ++------ .../aissemble/core/cdi/CdiContainer.java | 2 +- .../aissemble/core/cdi/CdiContext.java | 2 +- .../core/inference/RestInferenceClient.java | 2 +- .../core/filestore/TestFileStore.java | 2 +- .../data/access/SparkQueryService.java | 4 +- .../security/DataAccessRolesAugmentor.java | 2 +- .../rest/client/DriftDetectionClient.java | 12 +- .../rest/client/DriftDetectionResource.java | 4 +- .../client/DriftDetectionRestClientIT.java | 2 +- .../drift/detection/DriftDetector.java | 2 +- .../service/DriftDetectionService.java | 12 +- .../service/DriftDetectionServiceTest.java | 2 +- .../foundation-data-lineage-java/pom.xml | 14 +- .../aissemble/data/lineage/EventEmitter.java | 2 +- .../lineage/transport/ConsoleTransport.java | 2 +- .../lineage/transport/MessagingTransport.java | 4 +- .../data/lineage/SendOpenLineageSteps.java | 6 +- .../data/lineage/cdi/TestCdiContext.java | 2 +- .../artifacts-maven-plugin/pom.xml | 32 ---- .../foundation-model-plugin/pom.xml | 5 + .../mda-maven-plugin/pom.xml | 18 +- foundation/foundation-mda/pom.xml | 2 +- .../templates/cucumber.pipeline.steps.java.vm | 8 +- .../cucumber.spark.test.base.harness.java.vm | 2 +- .../cucumber.spark.test.impl.harness.java.vm | 2 +- .../cucumber.test.cdi.context.java.vm | 2 +- .../data.access.resource.base.java.vm | 5 +- .../data.access.resource.impl.java.vm | 6 +- .../asynchronous.processor.base.java.vm | 4 +- .../asynchronous.processor.impl.java.vm | 2 +- .../data-delivery-spark/pipeline.pom.xml.vm | 19 +- .../synchronous.processor.base.java.vm | 4 +- .../synchronous.processor.impl.java.vm | 2 +- .../data-lineage-consumer-impl.java.vm | 2 +- .../data-lineage-consumer.pom.xml.vm | 12 ++ .../file-store/file.store.impl.java.vm | 2 +- .../pipeline.cdi.context.base.java.vm | 2 +- .../pipeline.cdi.context.impl.java.vm | 2 +- .../templates/pipeline.driver.impl.java.vm | 4 +- .../core/cdi/MessagingCdiContext.java | 4 +- .../messaging/core/CdiConfigurationSteps.java | 2 +- .../messaging/core/TestCdiContext.java | 2 +- .../messaging/example/ACdiComponent.java | 2 +- .../example/AnotherCdiComponent.java | 2 +- .../messaging/python/MessagingService.java | 2 +- .../cdi/MessagingServiceCdiContext.java | 2 +- .../python/channel/impl/TopicEmitterImpl.java | 4 +- .../channel/impl/TopicListenerImpl.java | 2 +- .../src/test/java/TestConfiguration.java | 2 +- .../messaging/python/ReceiveMessageSteps.java | 6 +- .../messaging/python/SendMessageSteps.java | 6 +- .../foundation-metadata-producer/pom.xml | 12 ++ .../metadata/producer/MetadataProducer.java | 4 +- .../client/PolicyDecisionPointProxy.java | 8 +- .../foundation-service-discovery/pom.xml | 6 +- .../core/ServiceDiscoveryProvider.java | 8 +- .../core/ServiceDiscoveryResource.java | 20 +- .../core/ServiceDiscoveryResourceTest.java | 2 +- pom.xml | 7 +- .../pom.xml | 179 +++++++++--------- .../test-data-delivery-spark-model/pom.xml | 179 +++++++++--------- .../aiops/mda/pattern/LineageTest.java | 9 +- 127 files changed, 638 insertions(+), 576 deletions(-) create mode 100644 extensions/extensions-metadata-service/src/test/resources/log4j2.xml diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 7ec15ec12..d7c03e89c 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -40,18 +40,18 @@ 19 3.6.0 3.9.0 - 2.8.3.Final + 3.6.9 ${version.quarkus} 3.2.4 - 1.12.0 - 1.6.0 - 3.15.0 + 3.9.1 + 2.9.1 + 4.24.0 0.10.1 3.0.8 - 2.13.2 - 2.5.0 + 2.14.2 + 2.6.0 3.8.6 - 0.5.0 + 1.4.0 2.1.1 42.5.1 4.7.7.Final @@ -66,9 +66,15 @@ 5.1.0 4.0.3 + + 4.0.1 + 2.0.1 + 3.0.0 + 3.1.0 + 3.4.0 - 2.12.1 + 2.12.13 2.4.0 8.9.0 1.4.0 @@ -78,8 +84,8 @@ 4.1.5_for_spark_3 1.12.262 1.1.1 - 0.6.0 - 7.4.1 + 1.0.0 + ${version.cucumber} 0.45-tb-0.1.0 @@ -149,8 +155,14 @@ - + + + + io.smallrye + jandex + 3.2.2 + net.masterthought cucumber-reporting diff --git a/build-support/aissemble-enforcer-extension/pom.xml b/build-support/aissemble-enforcer-extension/pom.xml index f4c47bf3d..7d76db7ca 100644 --- a/build-support/aissemble-enforcer-extension/pom.xml +++ b/build-support/aissemble-enforcer-extension/pom.xml @@ -41,6 +41,12 @@ maven-core ${version.maven.core} + + javax.inject + javax.inject + ${version.javax.inject} + provided + org.apache.commons commons-lang3 diff --git a/extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/cdi/SlackCdiContext.java b/extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/cdi/SlackCdiContext.java index 0ea6cd619..6fe3c1481 100644 --- a/extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/cdi/SlackCdiContext.java +++ b/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; diff --git a/extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/consumer/SlackConsumer.java b/extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/consumer/SlackConsumer.java index 4bf32ee41..d35eda1a4 100644 --- a/extensions/extensions-alerting/extensions-alerting-slack/src/main/java/com/boozallen/aissemble/alerting/slack/consumer/SlackConsumer.java +++ b/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; diff --git a/extensions/extensions-alerting/extensions-alerting-teams/pom.xml b/extensions/extensions-alerting/extensions-alerting-teams/pom.xml index ae1010bc6..554640e77 100644 --- a/extensions/extensions-alerting/extensions-alerting-teams/pom.xml +++ b/extensions/extensions-alerting/extensions-alerting-teams/pom.xml @@ -13,9 +13,29 @@ aiSSEMBLE::Extensions::Alerting::Teams The Alerting Teams module uses Microsoft Teams to send alerts - - 2.8.0 - + + + + io.quarkus + quarkus-universe-bom + ${version.quarkus.plugin} + pom + import + + + + io.smallrye.reactive + * + + + + + io.smallrye.reactive + smallrye-reactive-messaging-api + ${version.smallrye.reactive.messaging} + + + @@ -29,7 +49,6 @@ io.smallrye.config smallrye-config - ${version.smallrye.config.override} org.technologybrewery.krausening @@ -74,10 +93,6 @@ org.jboss.slf4j slf4j-jboss-logmanager - - io.smallrye.config - smallrye-config - test diff --git a/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsClient.java b/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsClient.java index 8b4e193dd..7a89e08b2 100644 --- a/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsClient.java +++ b/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 diff --git a/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsMessageService.java b/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsMessageService.java index 3dc333a27..61665d969 100644 --- a/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/TeamsMessageService.java +++ b/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 diff --git a/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/cdi/TeamsCdiContext.java b/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/cdi/TeamsCdiContext.java index 8e8274a4b..7a82e3ec7 100644 --- a/extensions/extensions-alerting/extensions-alerting-teams/src/main/java/com/boozallen/aissemble/alerting/teams/cdi/TeamsCdiContext.java +++ b/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; diff --git a/extensions/extensions-alerting/extensions-alerting-teams/src/test/java/com/boozallen/aissemble/alerting/TeamsAlertingTest.java b/extensions/extensions-alerting/extensions-alerting-teams/src/test/java/com/boozallen/aissemble/alerting/TeamsAlertingTest.java index 78c4d1d21..33a17fad5 100644 --- a/extensions/extensions-alerting/extensions-alerting-teams/src/test/java/com/boozallen/aissemble/alerting/TeamsAlertingTest.java +++ b/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; diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/pom.xml b/extensions/extensions-data-delivery/extensions-data-delivery-spark/pom.xml index f520476af..f62cab2f0 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/pom.xml +++ b/extensions/extensions-data-delivery/extensions-data-delivery-spark/pom.xml @@ -53,6 +53,11 @@ jackson-dataformat-yaml ${version.jackson} + + org.scala-lang + scala-library + ${version.scala} + org.apache.spark spark-core_2.12 @@ -93,6 +98,13 @@ foundation-messaging-java ${project.version} + + + + javax.servlet + javax.servlet-api + ${version.javax.servlet} + io.delta diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/messaging/PipelineMessagingConfig.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/messaging/PipelineMessagingConfig.java index 04f3e8502..8bc4829dc 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/messaging/PipelineMessagingConfig.java +++ b/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; diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/spark/objectstore/ObjectStoreValidator.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/spark/objectstore/ObjectStoreValidator.java index 38334d089..2880303c0 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/main/java/com/boozallen/aiops/data/delivery/spark/objectstore/ObjectStoreValidator.java +++ b/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; diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/MessagingConfigurationSteps.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/MessagingConfigurationSteps.java index af6304c08..fcad51a24 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/MessagingConfigurationSteps.java +++ b/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; diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/TestCdiContext.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/TestCdiContext.java index 892159634..51675bf4a 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/TestCdiContext.java +++ b/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; diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOnlyTestStep.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOnlyTestStep.java index 6c4b89d82..25d40cdfa 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOnlyTestStep.java +++ b/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 { diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOutTestStep.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOutTestStep.java index 3543c7157..9609ee4b6 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/InOutTestStep.java +++ b/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 { diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/NoChannelTestStep.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/NoChannelTestStep.java index 13d3c32db..1a62baa58 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/NoChannelTestStep.java +++ b/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 { diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OutOnlyTestStep.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OutOnlyTestStep.java index 6b6eea555..a2096abf1 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OutOnlyTestStep.java +++ b/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 { diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OverrideTestStep.java b/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OverrideTestStep.java index 5dd6c47a1..69c83e408 100644 --- a/extensions/extensions-data-delivery/extensions-data-delivery-spark/src/test/java/com/boozallen/aiops/data/delivery/messaging/pipeline/steps/OverrideTestStep.java +++ b/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 { diff --git a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml index b6d8f6a7e..58a2038f1 100644 --- a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml +++ b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml @@ -22,11 +22,6 @@ - - - ${version.quarkus.cucumber.java} - - org.technologybrewery.krausening diff --git a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducer.java b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducer.java index ee99c1455..12c889dab 100644 --- a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducer.java +++ b/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; diff --git a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducerService.java b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducerService.java index 73d7fb2eb..a92ac5562 100644 --- a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/HttpProducerService.java +++ b/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; /** diff --git a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/LineageMessageHandler.java b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/LineageMessageHandler.java index d355a8f19..171f01fba 100644 --- a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/main/java/com/boozallen/aissemble/datalineage/consumer/LineageMessageHandler.java +++ b/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; diff --git a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/test/java/com/boozallen/aissemble/datalineage/consumer/MessageHandlingSteps.java b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/test/java/com/boozallen/aissemble/datalineage/consumer/MessageHandlingSteps.java index fedc30f0c..60e97b44b 100644 --- a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/src/test/java/com/boozallen/aissemble/datalineage/consumer/MessageHandlingSteps.java +++ b/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; diff --git a/extensions/extensions-messaging/extensions-messaging-kafka/src/main/java/com/boozallen/aissemble/kafka/context/KafkaConnectorCdiContext.java b/extensions/extensions-messaging/extensions-messaging-kafka/src/main/java/com/boozallen/aissemble/kafka/context/KafkaConnectorCdiContext.java index 8c7bdbe20..89816baf9 100644 --- a/extensions/extensions-messaging/extensions-messaging-kafka/src/main/java/com/boozallen/aissemble/kafka/context/KafkaConnectorCdiContext.java +++ b/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; diff --git a/extensions/extensions-messaging/extensions-messaging-quarkus/src/main/java/com/boozallen/aissemble/quarkus/context/QuarkusCdiContext.java b/extensions/extensions-messaging/extensions-messaging-quarkus/src/main/java/com/boozallen/aissemble/quarkus/context/QuarkusCdiContext.java index ec5e436eb..5c30df552 100644 --- a/extensions/extensions-messaging/extensions-messaging-quarkus/src/main/java/com/boozallen/aissemble/quarkus/context/QuarkusCdiContext.java +++ b/extensions/extensions-messaging/extensions-messaging-quarkus/src/main/java/com/boozallen/aissemble/quarkus/context/QuarkusCdiContext.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 org.jboss.resteasy.microprofile.client.RestClientExtension; diff --git a/extensions/extensions-metadata-service/pom.xml b/extensions/extensions-metadata-service/pom.xml index d6660e3f4..66bec386c 100644 --- a/extensions/extensions-metadata-service/pom.xml +++ b/extensions/extensions-metadata-service/pom.xml @@ -81,6 +81,12 @@ pom import + + + org.antlr + antlr4-runtime + 4.9.2 + @@ -111,6 +117,29 @@ spark-hive_2.12 ${version.spark} + + + org.scala-lang + scala-reflect + ${version.scala} + + + org.scala-lang + scala-compiler + ${version.scala} + + + org.scala-lang + scala-library + ${version.scala} + + + + + javax.servlet + javax.servlet-api + ${version.javax.servlet} + mysql mysql-connector-java diff --git a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/LoggingMetadataAPIService.java b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/LoggingMetadataAPIService.java index c986d9eec..187679c18 100644 --- a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/LoggingMetadataAPIService.java +++ b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/LoggingMetadataAPIService.java @@ -15,7 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataAPIType.java b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataAPIType.java index d2876e1f0..d6539cf5a 100644 --- a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataAPIType.java +++ b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataAPIType.java @@ -10,7 +10,7 @@ * #L% */ -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; diff --git a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataIngest.java b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataIngest.java index 9cd56923d..c98953094 100644 --- a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataIngest.java +++ b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataIngest.java @@ -14,8 +14,8 @@ import com.boozallen.aissemble.core.metadata.MetadataModel; import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Ingest Metadata from messaging diff --git a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataService.java b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataService.java index 797641207..b18368e13 100644 --- a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataService.java +++ b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataService.java @@ -13,12 +13,12 @@ import com.boozallen.aissemble.core.metadata.MetadataAPI; import com.boozallen.aissemble.core.metadata.MetadataModel; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; diff --git a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/hive/HiveMetadataAPIService.java b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/hive/HiveMetadataAPIService.java index bc6748b14..e4af0b223 100644 --- a/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/hive/HiveMetadataAPIService.java +++ b/extensions/extensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/hive/HiveMetadataAPIService.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; diff --git a/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/PipelineSteps.java b/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/PipelineSteps.java index afe64bf9a..dce301006 100644 --- a/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/PipelineSteps.java +++ b/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/PipelineSteps.java @@ -19,8 +19,8 @@ import io.cucumber.java.en.Then; import io.cucumber.java.en.When; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; diff --git a/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/SparkTestBaseHarness.java b/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/SparkTestBaseHarness.java index 6bcb4a571..0a13b71eb 100644 --- a/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/SparkTestBaseHarness.java +++ b/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/SparkTestBaseHarness.java @@ -17,7 +17,7 @@ import io.cucumber.plugin.event.EventPublisher; import io.cucumber.plugin.event.TestRunFinished; import io.cucumber.plugin.event.TestRunStarted; -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; import org.aeonbits.owner.KrauseningConfigFactory; import org.apache.commons.io.FileUtils; import org.apache.spark.sql.SparkSession; diff --git a/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/TestCdiContext.java b/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/TestCdiContext.java index a256db0dd..0b6cd312a 100644 --- a/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/TestCdiContext.java +++ b/extensions/extensions-metadata-service/src/test/java/com/boozallen/aiops/metadata/TestCdiContext.java @@ -11,9 +11,9 @@ */ import com.boozallen.aissemble.core.cdi.CdiContext; -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/extensions/extensions-metadata-service/src/test/resources/log4j2.xml b/extensions/extensions-metadata-service/src/test/resources/log4j2.xml new file mode 100644 index 000000000..19ccd71cf --- /dev/null +++ b/extensions/extensions-metadata-service/src/test/resources/log4j2.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/extensions/extensions-pipeline-invocation-service/pom.xml b/extensions/extensions-pipeline-invocation-service/pom.xml index 5bb58398c..01de7b4ca 100644 --- a/extensions/extensions-pipeline-invocation-service/pom.xml +++ b/extensions/extensions-pipeline-invocation-service/pom.xml @@ -13,10 +13,6 @@ aiSSEMBLE::Extensions::Pipeline Invocation Service Contains an invocation service for submitting spark applications - - ${version.quarkus.cucumber.java} - - @@ -72,6 +68,13 @@ com.boozallen.aissemble foundation-pdp-client-java + + + + org.jboss.resteasy + * + + com.auth0 diff --git a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/PipelineInvocationAgent.java b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/PipelineInvocationAgent.java index 74a27c981..dd9a2b406 100644 --- a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/PipelineInvocationAgent.java +++ b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/PipelineInvocationAgent.java @@ -15,8 +15,8 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesFileRegistry.java b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesFileRegistry.java index bbb227a74..330c05f9c 100644 --- a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesFileRegistry.java +++ b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesFileRegistry.java @@ -15,7 +15,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/HttpEndpoint.java b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/HttpEndpoint.java index 7a86805ce..ab7a933a5 100644 --- a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/HttpEndpoint.java +++ b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/HttpEndpoint.java @@ -14,14 +14,14 @@ import com.boozallen.aissemble.pipeline.invocation.service.serialization.PipelineInvocationRequest; import org.jboss.logging.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; /** diff --git a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/MessageEndpoint.java b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/MessageEndpoint.java index f2f963fdc..95dfce20d 100644 --- a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/MessageEndpoint.java +++ b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/endpoint/MessageEndpoint.java @@ -16,8 +16,8 @@ import org.eclipse.microprofile.reactive.messaging.Incoming; import org.jboss.logging.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Entrypoint for message-based requests for SparkApplication submission. diff --git a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/util/exec/HelmCommandExecutor.java b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/util/exec/HelmCommandExecutor.java index 76bd8daa9..959b2582f 100644 --- a/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/util/exec/HelmCommandExecutor.java +++ b/extensions/extensions-pipeline-invocation-service/src/main/java/com/boozallen/aissemble/pipeline/invocation/service/util/exec/HelmCommandExecutor.java @@ -16,7 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; diff --git a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ConfigurationSteps.java b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ConfigurationSteps.java index 29c74117e..cfd47d0a3 100644 --- a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ConfigurationSteps.java +++ b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ConfigurationSteps.java @@ -13,8 +13,8 @@ import io.cucumber.java.en.Then; import io.cucumber.java.en.When; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ConfigurationSteps { diff --git a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/DeserializationSteps.java b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/DeserializationSteps.java index 67f6d64ab..babe512fb 100644 --- a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/DeserializationSteps.java +++ b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/DeserializationSteps.java @@ -15,7 +15,7 @@ import io.cucumber.java.en.Then; import io.cucumber.java.en.When; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import static org.junit.jupiter.api.Assertions.*; diff --git a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/HelmCommandSteps.java b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/HelmCommandSteps.java index 29ad2c971..4ddcb3f34 100644 --- a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/HelmCommandSteps.java +++ b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/HelmCommandSteps.java @@ -15,8 +15,8 @@ import io.cucumber.java.en.Then; import io.cucumber.java.en.When; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesDetectionSteps.java b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesDetectionSteps.java index 29929efb3..a32adf6d9 100644 --- a/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesDetectionSteps.java +++ b/extensions/extensions-pipeline-invocation-service/src/test/java/com/boozallen/aissemble/pipeline/invocation/service/ValuesDetectionSteps.java @@ -13,8 +13,8 @@ import io.cucumber.java.en.Then; import io.cucumber.java.en.When; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.List; import java.util.Set; diff --git a/extensions/extensions-security/extensions-authzforce/pom.xml b/extensions/extensions-security/extensions-authzforce/pom.xml index 2ca68ef1b..9d6753c31 100644 --- a/extensions/extensions-security/extensions-authzforce/pom.xml +++ b/extensions/extensions-security/extensions-authzforce/pom.xml @@ -91,6 +91,26 @@ ${version.slf4j} + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + io.cucumber diff --git a/extensions/extensions-security/extensions-authzforce/src/test/java/com/boozallen/aissemble/security/authorization/Configurer.java b/extensions/extensions-security/extensions-authzforce/src/test/java/com/boozallen/aissemble/security/authorization/Configurer.java index b7e06b071..250cc6a94 100644 --- a/extensions/extensions-security/extensions-authzforce/src/test/java/com/boozallen/aissemble/security/authorization/Configurer.java +++ b/extensions/extensions-security/extensions-authzforce/src/test/java/com/boozallen/aissemble/security/authorization/Configurer.java @@ -11,36 +11,19 @@ */ import com.boozallen.aissemble.security.authorization.policy.PolicyRequest; -import io.cucumber.core.api.TypeRegistry; -import io.cucumber.core.api.TypeRegistryConfigurer; -import io.cucumber.datatable.DataTableType; -import io.cucumber.datatable.TableEntryTransformer; +import io.cucumber.java.DataTableType; -import java.util.Locale; import java.util.Map; -public class Configurer implements TypeRegistryConfigurer { +public class Configurer { - @Override - public void configureTypeRegistry(TypeRegistry registry) { - - registry.defineDataTableType(new DataTableType(PolicyRequest.class, new TableEntryTransformer() { - @Override - public PolicyRequest transform(Map entry) { - return new PolicyRequest(entry.get("name"),entry.get("resource"),entry.get("action")); - } - })); - registry.defineDataTableType(new DataTableType(TokenDataInput.class, new TableEntryTransformer() { - @Override - public TokenDataInput transform(Map entry) { - return new TokenDataInput(entry.get("name"),entry.get("resource"),entry.get("action"),entry.get("result")); - } - })); + @DataTableType + public static PolicyRequest policyRequestEntry(Map entry) { + return new PolicyRequest(entry.get("name"), entry.get("resource"), entry.get("action")); } - @Override - public Locale locale() { - return Locale.ENGLISH; + @DataTableType + public static TokenDataInput tokenDataInputEntry(Map entry) { + return new TokenDataInput(entry.get("name"), entry.get("resource"), entry.get("action"), entry.get("result")); } - } diff --git a/extensions/extensions-security/extensions-policy-decision-point-service/src/main/java/com/boozallen/aissemble/security/PDPHelperResource.java b/extensions/extensions-security/extensions-policy-decision-point-service/src/main/java/com/boozallen/aissemble/security/PDPHelperResource.java index 19886767a..eb654f13e 100644 --- a/extensions/extensions-security/extensions-policy-decision-point-service/src/main/java/com/boozallen/aissemble/security/PDPHelperResource.java +++ b/extensions/extensions-security/extensions-policy-decision-point-service/src/main/java/com/boozallen/aissemble/security/PDPHelperResource.java @@ -20,12 +20,12 @@ import com.boozallen.aissemble.security.authorization.AissembleSimpleSecureTokenServiceClient; import com.boozallen.aissemble.security.authorization.policy.PolicyDecisionPoint; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -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.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/api") public class PDPHelperResource { diff --git a/foundation/foundation-alerting/pom.xml b/foundation/foundation-alerting/pom.xml index dc7080cc0..413dd0ede 100644 --- a/foundation/foundation-alerting/pom.xml +++ b/foundation/foundation-alerting/pom.xml @@ -56,6 +56,16 @@ weld-se-core ${version.weld} + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${version.jakarta.cdi} + + + jakarta.inject + jakarta.inject-api + ${version.jakarta.inject} + diff --git a/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/AlertProducer.java b/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/AlertProducer.java index 6c7f30bea..20860c4ab 100644 --- a/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/AlertProducer.java +++ b/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/AlertProducer.java @@ -18,8 +18,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.UUID; diff --git a/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/consumer/AlertLogger.java b/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/consumer/AlertLogger.java index f980d1920..a68e85440 100644 --- a/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/consumer/AlertLogger.java +++ b/foundation/foundation-alerting/src/main/java/com/boozallen/aissemble/alerting/core/consumer/AlertLogger.java @@ -10,7 +10,7 @@ * #L% */ -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.slf4j.Logger; diff --git a/foundation/foundation-archetype/pom.xml b/foundation/foundation-archetype/pom.xml index c262cd227..c464c8cbf 100644 --- a/foundation/foundation-archetype/pom.xml +++ b/foundation/foundation-archetype/pom.xml @@ -38,8 +38,8 @@ org.codehaus.groovy - groovy-console - 3.0.17 + groovy-all + 2.4.21 test diff --git a/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-java/pom.xml b/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-java/pom.xml index 6f4aa1d60..a86c6c24d 100644 --- a/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-java/pom.xml +++ b/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-java/pom.xml @@ -52,6 +52,7 @@ + META-INF/services/javax.ws.rs.ext.Providers - - javax.annotation - javax.annotation-api - 1.3.2 - io.cucumber cucumber-java diff --git a/foundation/foundation-configuration-store/pom.xml b/foundation/foundation-configuration-store/pom.xml index c50718e8d..0eec05826 100644 --- a/foundation/foundation-configuration-store/pom.xml +++ b/foundation/foundation-configuration-store/pom.xml @@ -106,12 +106,6 @@ pom import - - io.cucumber - cucumber-java - ${version.quarkus.cucumber.java} - test - diff --git a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/ConfigStoreInit.java b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/ConfigStoreInit.java index 30ba28f37..13e5187ee 100644 --- a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/ConfigStoreInit.java +++ b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/ConfigStoreInit.java @@ -23,10 +23,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; import java.io.IOException; import java.nio.file.Files; diff --git a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/InMemoryPropertyDao.java b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/InMemoryPropertyDao.java index cb027ef95..9a0db0af5 100644 --- a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/InMemoryPropertyDao.java +++ b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/InMemoryPropertyDao.java @@ -17,7 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/KrauseningPropertyDao.java b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/KrauseningPropertyDao.java index 27909211a..f4cd9d7a4 100644 --- a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/KrauseningPropertyDao.java +++ b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/KrauseningPropertyDao.java @@ -16,7 +16,7 @@ import java.util.Properties; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDao.java b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDao.java index d161808cb..127171b6c 100644 --- a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDao.java +++ b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDao.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/mutating/webhook/ConfigMutatingWebhook.java b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/mutating/webhook/ConfigMutatingWebhook.java index 81106afb3..b4cbd118e 100644 --- a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/mutating/webhook/ConfigMutatingWebhook.java +++ b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/mutating/webhook/ConfigMutatingWebhook.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.core.json.JsonReadFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.fge.jsonpatch.diff.JsonDiff; +import com.flipkart.zjsonpatch.JsonDiff; import io.fabric8.kubernetes.api.model.StatusBuilder; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -29,13 +29,13 @@ import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview; import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReviewBuilder; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import java.util.Base64; import java.util.HashMap; import java.util.Map; diff --git a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/service/ConfigService.java b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/service/ConfigService.java index d7b4350c8..9f525184e 100644 --- a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/service/ConfigService.java +++ b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/service/ConfigService.java @@ -16,13 +16,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/aissemble-properties") public class ConfigService { diff --git a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/store/ConfigLoader.java b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/store/ConfigLoader.java index e48e07a0b..9a5970e27 100644 --- a/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/store/ConfigLoader.java +++ b/foundation/foundation-configuration-store/src/main/java/com/boozallen/aissemble/configuration/store/ConfigLoader.java @@ -25,9 +25,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.apache.commons.lang3.BooleanUtils; import org.slf4j.Logger; diff --git a/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/configuration/store/LoadConfigurationsSteps.java b/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/configuration/store/LoadConfigurationsSteps.java index 51d021985..191846204 100644 --- a/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/configuration/store/LoadConfigurationsSteps.java +++ b/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/configuration/store/LoadConfigurationsSteps.java @@ -22,8 +22,8 @@ import java.util.Properties; import java.util.Set; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/util/TestPropertyDao.java b/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/util/TestPropertyDao.java index acb79429c..758f05317 100644 --- a/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/util/TestPropertyDao.java +++ b/foundation/foundation-configuration-store/src/test/java/com/boozallen/aissemble/util/TestPropertyDao.java @@ -13,7 +13,7 @@ import com.boozallen.aissemble.configuration.dao.InMemoryPropertyDao; import com.boozallen.aissemble.configuration.store.Property; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/foundation/foundation-core-java/pom.xml b/foundation/foundation-core-java/pom.xml index a93d428bf..7c95920fb 100644 --- a/foundation/foundation-core-java/pom.xml +++ b/foundation/foundation-core-java/pom.xml @@ -33,13 +33,6 @@ pom import - - - - com.google.code.gson - gson - 2.8.9 - @@ -84,40 +77,27 @@ - io.vertx - vertx-web-client - ${version.vertx} - - - io.grpc - grpc-netty-shaded - ${version.grpc.io} - runtime + jakarta.enterprise + jakarta.enterprise.cdi-api + ${version.jakarta.cdi} - io.grpc - grpc-protobuf - ${version.grpc.io} + jakarta.inject + jakarta.inject-api + ${version.jakarta.inject} - io.grpc - grpc-stub - ${version.grpc.io} - - - org.jboss.resteasy - resteasy-client - compile - - - org.jboss.resteasy - resteasy-jackson2-provider - compile + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation} + - javax.annotation - javax.annotation-api - 1.3.2 + io.vertx + vertx-web-client + ${version.vertx} com.fasterxml.jackson.core @@ -134,17 +114,6 @@ jackson-annotations ${version.jackson} - - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j2-impl - - org.apache.commons commons-collections4 @@ -154,18 +123,8 @@ commons-lang3 - io.quarkus - quarkus-kafka-client - - - org.jboss.slf4j - slf4j-jboss-logmanager - - - - - io.smallrye.reactive - smallrye-reactive-messaging-api + commons-io + commons-io org.apache.jclouds @@ -176,6 +135,10 @@ org.technologybrewery.krausening krausening + + org.slf4j + slf4j-api + diff --git a/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContainer.java b/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContainer.java index d97e34b05..83b8d9e49 100644 --- a/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContainer.java +++ b/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContainer.java @@ -16,7 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; import java.util.Arrays; import java.util.List; diff --git a/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContext.java b/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContext.java index bbc85fd99..538345d9b 100644 --- a/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContext.java +++ b/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/cdi/CdiContext.java @@ -10,7 +10,7 @@ * #L% */ -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; import java.util.List; /** diff --git a/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/inference/RestInferenceClient.java b/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/inference/RestInferenceClient.java index 980569daa..bde313d6c 100644 --- a/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/inference/RestInferenceClient.java +++ b/foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/inference/RestInferenceClient.java @@ -17,7 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/foundation/foundation-core-java/src/test/java/com/boozallen/aissemble/core/filestore/TestFileStore.java b/foundation/foundation-core-java/src/test/java/com/boozallen/aissemble/core/filestore/TestFileStore.java index 2ce663034..1096d17de 100644 --- a/foundation/foundation-core-java/src/test/java/com/boozallen/aissemble/core/filestore/TestFileStore.java +++ b/foundation/foundation-core-java/src/test/java/com/boozallen/aissemble/core/filestore/TestFileStore.java @@ -11,7 +11,7 @@ */ import org.jclouds.filesystem.reference.FilesystemConstants; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.nio.file.Paths; import java.util.Properties; diff --git a/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/SparkQueryService.java b/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/SparkQueryService.java index 723277ad5..a541ccee1 100644 --- a/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/SparkQueryService.java +++ b/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/SparkQueryService.java @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.List; -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.commons.lang3.ArrayUtils; diff --git a/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/security/DataAccessRolesAugmentor.java b/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/security/DataAccessRolesAugmentor.java index 89a07e9f8..90a9ce99b 100644 --- a/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/security/DataAccessRolesAugmentor.java +++ b/foundation/foundation-data-access/src/main/java/com/boozallen/aissemble/data/access/security/DataAccessRolesAugmentor.java @@ -13,7 +13,7 @@ import java.security.Principal; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.boozallen.aissemble.security.authorization.policy.PolicyDecision; import com.boozallen.aissemble.security.authorization.policy.PolicyDecisionPoint; diff --git a/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionClient.java b/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionClient.java index b13626dae..5cf87d8a2 100644 --- a/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionClient.java +++ b/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionClient.java @@ -10,12 +10,12 @@ * #L% */ -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionResource.java b/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionResource.java index 5dcf62b4a..ec7128f53 100644 --- a/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionResource.java +++ b/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/main/java/com/boozallen/drift/detection/rest/client/DriftDetectionResource.java @@ -10,8 +10,8 @@ * #L% */ -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/test/java/com/boozallen/drift/detection/rest/client/DriftDetectionRestClientIT.java b/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/test/java/com/boozallen/drift/detection/rest/client/DriftDetectionRestClientIT.java index 0bcb7cb50..f3367ec8d 100644 --- a/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/test/java/com/boozallen/drift/detection/rest/client/DriftDetectionRestClientIT.java +++ b/foundation/foundation-drift-detection/foundation-drift-detection-client-java/src/test/java/com/boozallen/drift/detection/rest/client/DriftDetectionRestClientIT.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/foundation/foundation-drift-detection/foundation-drift-detection-engine/src/main/java/com/boozallen/drift/detection/DriftDetector.java b/foundation/foundation-drift-detection/foundation-drift-detection-engine/src/main/java/com/boozallen/drift/detection/DriftDetector.java index 945b0b0f4..a416b53ac 100644 --- a/foundation/foundation-drift-detection/foundation-drift-detection-engine/src/main/java/com/boozallen/drift/detection/DriftDetector.java +++ b/foundation/foundation-drift-detection/foundation-drift-detection-engine/src/main/java/com/boozallen/drift/detection/DriftDetector.java @@ -12,7 +12,7 @@ import java.util.List; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/foundation/foundation-drift-detection/foundation-drift-detection-service/src/main/java/com/boozallen/drift/detection/service/DriftDetectionService.java b/foundation/foundation-drift-detection/foundation-drift-detection-service/src/main/java/com/boozallen/drift/detection/service/DriftDetectionService.java index cbfb24f94..fb7e80fed 100644 --- a/foundation/foundation-drift-detection/foundation-drift-detection-service/src/main/java/com/boozallen/drift/detection/service/DriftDetectionService.java +++ b/foundation/foundation-drift-detection/foundation-drift-detection-service/src/main/java/com/boozallen/drift/detection/service/DriftDetectionService.java @@ -10,12 +10,12 @@ * #L% */ -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; diff --git a/foundation/foundation-drift-detection/foundation-drift-detection-service/src/test/java/com/boozallen/drift/detection/service/DriftDetectionServiceTest.java b/foundation/foundation-drift-detection/foundation-drift-detection-service/src/test/java/com/boozallen/drift/detection/service/DriftDetectionServiceTest.java index 022191583..8b2c84cfd 100644 --- a/foundation/foundation-drift-detection/foundation-drift-detection-service/src/test/java/com/boozallen/drift/detection/service/DriftDetectionServiceTest.java +++ b/foundation/foundation-drift-detection/foundation-drift-detection-service/src/test/java/com/boozallen/drift/detection/service/DriftDetectionServiceTest.java @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Test; diff --git a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/pom.xml b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/pom.xml index 7c589f4de..3050188e8 100644 --- a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/pom.xml +++ b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/pom.xml @@ -36,6 +36,16 @@ + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${version.jakarta.cdi} + + + jakarta.inject + jakarta.inject-api + ${version.jakarta.inject} + io.openlineage openlineage-java @@ -69,13 +79,13 @@ io.cucumber cucumber-java - 7.4.1 + ${version.cucumber} test io.cucumber cucumber-junit - 7.4.1 + ${version.cucumber} test diff --git a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/EventEmitter.java b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/EventEmitter.java index 3e56fee27..dc7f23cec 100644 --- a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/EventEmitter.java +++ b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/EventEmitter.java @@ -14,7 +14,7 @@ import com.boozallen.aissemble.data.lineage.transport.MessagingTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; public final class EventEmitter { diff --git a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/ConsoleTransport.java b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/ConsoleTransport.java index 167672869..f7e7d034d 100644 --- a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/ConsoleTransport.java +++ b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/ConsoleTransport.java @@ -16,7 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * If added to the CDI container, this class will log all emitted Run Events to the console. Adding this class will diff --git a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/MessagingTransport.java b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/MessagingTransport.java index b71a83bae..c3ded24ad 100644 --- a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/MessagingTransport.java +++ b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/main/java/com/boozallen/aissemble/data/lineage/transport/MessagingTransport.java @@ -19,8 +19,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; /** * Emits lineage events as messages as configured via smallrye. diff --git a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/SendOpenLineageSteps.java b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/SendOpenLineageSteps.java index c0fbc212c..00de98bf9 100644 --- a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/SendOpenLineageSteps.java +++ b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/SendOpenLineageSteps.java @@ -24,11 +24,11 @@ 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.memory.InMemoryConnector; import org.jboss.weld.environment.se.WeldContainer; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; import java.util.HashMap; import java.util.Map; import java.util.List; diff --git a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/cdi/TestCdiContext.java b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/cdi/TestCdiContext.java index 6731ab346..9bdf77119 100644 --- a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/cdi/TestCdiContext.java +++ b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-java/src/test/java/com/boozallen/aissemble/data/lineage/cdi/TestCdiContext.java @@ -10,7 +10,7 @@ * #L% */ import com.boozallen.aissemble.messaging.core.cdi.MessagingCdiContext; -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; import java.util.ArrayList; import java.util.List; diff --git a/foundation/foundation-maven-plugins/artifacts-maven-plugin/pom.xml b/foundation/foundation-maven-plugins/artifacts-maven-plugin/pom.xml index 402c791db..db0fbe7eb 100644 --- a/foundation/foundation-maven-plugins/artifacts-maven-plugin/pom.xml +++ b/foundation/foundation-maven-plugins/artifacts-maven-plugin/pom.xml @@ -36,12 +36,6 @@ - - - org.codehaus.plexus - plexus-utils - 3.3.1 - commons-io commons-io @@ -114,49 +108,23 @@ - - io.cucumber - messages - 24.1.0 - test - io.cucumber cucumber-java ${version.cucumber} test - - - - io.cucumber - messages - - io.cucumber cucumber-junit ${version.cucumber} test - - - - io.cucumber - messages - - junit junit test - - org.mockito - mockito-core - 5.8.0 - test - diff --git a/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml b/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml index b0f5f56ad..1c6ea4933 100644 --- a/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml +++ b/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml @@ -72,6 +72,11 @@ ${version.maven.core} provided + + jakarta.inject + jakarta.inject-api + ${version.jakarta.inject} + \ No newline at end of file diff --git a/foundation/foundation-maven-plugins/mda-maven-plugin/pom.xml b/foundation/foundation-maven-plugins/mda-maven-plugin/pom.xml index 0de6925b9..4b2cee0d2 100644 --- a/foundation/foundation-maven-plugins/mda-maven-plugin/pom.xml +++ b/foundation/foundation-maven-plugins/mda-maven-plugin/pom.xml @@ -76,22 +76,12 @@ ${version.mojo.executor} - org.apache.logging.log4j - log4j-slf4j2-impl + org.slf4j + slf4j-api - - - org.eclipse.aether - aether-connector-basic - 1.0.0.v20140518 - test - - - org.eclipse.aether - aether-transport-http - 1.0.0.v20140518 - test + org.apache.logging.log4j + log4j-slf4j2-impl diff --git a/foundation/foundation-mda/pom.xml b/foundation/foundation-mda/pom.xml index 719c08a81..e1686024f 100644 --- a/foundation/foundation-mda/pom.xml +++ b/foundation/foundation-mda/pom.xml @@ -113,7 +113,7 @@ javax.inject javax.inject - 1 + ${version.javax.inject} provided diff --git a/foundation/foundation-mda/src/main/resources/templates/cucumber.pipeline.steps.java.vm b/foundation/foundation-mda/src/main/resources/templates/cucumber.pipeline.steps.java.vm index 9857ea1b1..2006b8c93 100644 --- a/foundation/foundation-mda/src/main/resources/templates/cucumber.pipeline.steps.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/cucumber.pipeline.steps.java.vm @@ -5,8 +5,8 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; import org.eclipse.microprofile.reactive.messaging.Message; @@ -15,8 +15,8 @@ import io.cucumber.java.Before; 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.memory.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemorySink; /** * Implementation steps for pipeline.feature. diff --git a/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.base.harness.java.vm b/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.base.harness.java.vm index 06221cf40..2ea82d25d 100644 --- a/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.base.harness.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.base.harness.java.vm @@ -21,7 +21,7 @@ import io.cucumber.plugin.EventListener; import io.cucumber.plugin.event.EventPublisher; import io.cucumber.plugin.event.TestRunFinished; import io.cucumber.plugin.event.TestRunStarted; -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; /** * Sets up base functionality for Spark to run within Cucumber. diff --git a/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.impl.harness.java.vm b/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.impl.harness.java.vm index 42f5fa389..ea91e3397 100644 --- a/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.impl.harness.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/cucumber.spark.test.impl.harness.java.vm @@ -16,7 +16,7 @@ import com.boozallen.aissemble.alerting.core.AlertProducer; import com.boozallen.aissemble.common.Constants; #end -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; /** * Sets up Spark to run within Cucumber. diff --git a/foundation/foundation-mda/src/main/resources/templates/cucumber.test.cdi.context.java.vm b/foundation/foundation-mda/src/main/resources/templates/cucumber.test.cdi.context.java.vm index 97ca1792b..cc3afabe7 100644 --- a/foundation/foundation-mda/src/main/resources/templates/cucumber.test.cdi.context.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/cucumber.test.cdi.context.java.vm @@ -5,7 +5,7 @@ import java.util.List; import ${basePackage}.cdi.PipelinesCdiContext; import com.boozallen.aissemble.core.cdi.CdiContext; -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; /** diff --git a/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.base.java.vm b/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.base.java.vm index 2246cc904..8932ed0f8 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.base.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.base.java.vm @@ -3,9 +3,8 @@ package ${basePackage}; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import org.eclipse.microprofile.config.ConfigProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.impl.java.vm b/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.impl.java.vm index 4110bbbef..c77f29954 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.impl.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-access/data.access.resource.impl.java.vm @@ -1,8 +1,8 @@ package ${basePackage}; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.eclipse.microprofile.graphql.GraphQLApi; import io.quarkus.runtime.StartupEvent; diff --git a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.base.java.vm b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.base.java.vm index 2641e5c0d..2df072dd7 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.base.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.base.java.vm @@ -43,7 +43,7 @@ import com.boozallen.aissemble.core.metadata.producer.MetadataProducer; #if ($step.isAlertingEnabled()) import com.boozallen.aissemble.alerting.core.Alert; import com.boozallen.aissemble.alerting.core.AlertProducerApi; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; #end @@ -70,7 +70,7 @@ import org.apache.spark.sql.api.java.UDF2; import com.boozallen.aissemble.data.encryption.policy.config.EncryptAlgorithm; import org.apache.spark.sql.types.DataTypes; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.Clock; #if ($pipeline.getDataLineage()) import java.time.ZonedDateTime; diff --git a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.impl.java.vm b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.impl.java.vm index fe4a1a442..cbeca8b51 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.impl.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/asynchronous.processor.impl.java.vm @@ -12,7 +12,7 @@ import java.util.List; import java.util.stream.Collectors; #end -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/pipeline.pom.xml.vm b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/pipeline.pom.xml.vm index fdee5bfd2..b340810e1 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/pipeline.pom.xml.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/pipeline.pom.xml.vm @@ -69,6 +69,7 @@ + META-INF/services/javax.ws.rs.ext.Providers #if ($pipeline.fileStores) @@ -118,7 +119,6 @@ org.technologybrewery.krausening krausening - ${version.krausening} com.boozallen.aissemble @@ -140,6 +140,13 @@ test ${version.aissemble} + + + + javax.servlet + javax.servlet-api + 3.1.0 + #if ($pipeline.isAlertingSupportNeeded()) com.boozallen.aissemble @@ -227,12 +234,6 @@ jclouds-allblobstore ${version.jclouds} - - - com.google.code.gson - gson - 2.8.9 - #end #if($enableSemanticDataSupport) @@ -245,19 +246,16 @@ io.cucumber cucumber-java - ${version.cucumber} test io.cucumber cucumber-junit - ${version.cucumber} test junit junit - ${version.junit} test @@ -275,7 +273,6 @@ net.masterthought cucumber-reporting - ${version.cucumber.reporting.plugin} test #if ($pipeline.fileStores) diff --git a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.base.java.vm b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.base.java.vm index 9c607a61f..517ea13aa 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.base.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.base.java.vm @@ -13,7 +13,7 @@ import com.boozallen.aissemble.core.metadata.producer.MetadataProducer; #if ($step.isAlertingEnabled()) import com.boozallen.aissemble.alerting.core.Alert; import com.boozallen.aissemble.alerting.core.AlertProducerApi; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; #end #if ($step.isPersistTypeRdbms() || $step.isPersistTypePostgres()) @@ -49,7 +49,7 @@ import org.apache.spark.sql.api.java.UDF2; import com.boozallen.aissemble.data.encryption.policy.config.EncryptAlgorithm; import org.apache.spark.sql.types.DataTypes; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.HashMap; import ${basePackage}.pipeline.PipelineBase; diff --git a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.impl.java.vm b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.impl.java.vm index 672c3dd81..118a1e927 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.impl.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-delivery-spark/synchronous.processor.impl.java.vm @@ -4,7 +4,7 @@ package ${basePackage}; import ${import}; #end -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer-impl.java.vm b/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer-impl.java.vm index c208d1dc7..01f38fc26 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer-impl.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer-impl.java.vm @@ -4,7 +4,7 @@ import com.boozallen.aissemble.data.lineage.consumer.MessageHandler; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.openlineage.client.OpenLineage; import java.util.concurrent.CompletionStage; diff --git a/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer.pom.xml.vm b/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer.pom.xml.vm index 1e62c78d2..b9ed1c60b 100644 --- a/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer.pom.xml.vm +++ b/foundation/foundation-mda/src/main/resources/templates/data-lineage-consumer/data-lineage-consumer.pom.xml.vm @@ -19,6 +19,18 @@ ${version.quarkus} pom import + + + + io.smallrye.reactive + * + + + + + io.smallrye.reactive + smallrye-reactive-messaging-api + ${version.smallrye.reactive.messaging} diff --git a/foundation/foundation-mda/src/main/resources/templates/file-store/file.store.impl.java.vm b/foundation/foundation-mda/src/main/resources/templates/file-store/file.store.impl.java.vm index 71fe0f1e8..8d868c789 100644 --- a/foundation/foundation-mda/src/main/resources/templates/file-store/file.store.impl.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/file-store/file.store.impl.java.vm @@ -1,6 +1,6 @@ package ${basePackage}.filestore; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * Utility for accessing the ${fileStore.name} file storage. To customize diff --git a/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.base.java.vm b/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.base.java.vm index 977470f3c..ee5056758 100644 --- a/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.base.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.base.java.vm @@ -3,7 +3,7 @@ package ${basePackage}.cdi; import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; #foreach ($step in $pipeline.steps) import ${basePackage}.${step.capitalizedName}; diff --git a/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.impl.java.vm b/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.impl.java.vm index 7385257bc..28309ae38 100644 --- a/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.impl.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/pipeline.cdi.context.impl.java.vm @@ -2,7 +2,7 @@ package ${basePackage}.cdi; import java.util.List; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; import com.boozallen.aissemble.core.filestore.EnvironmentVariableFileStoreConfig; import com.boozallen.aissemble.core.metadata.producer.MetadataProducer; diff --git a/foundation/foundation-mda/src/main/resources/templates/pipeline.driver.impl.java.vm b/foundation/foundation-mda/src/main/resources/templates/pipeline.driver.impl.java.vm index 664bb051f..cb395b48a 100644 --- a/foundation/foundation-mda/src/main/resources/templates/pipeline.driver.impl.java.vm +++ b/foundation/foundation-mda/src/main/resources/templates/pipeline.driver.impl.java.vm @@ -22,8 +22,8 @@ import java.util.concurrent.CompletionStage; #end #if ($needsAnyCdi) -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; #end import ${basePackage}.pipeline.PipelineBase; diff --git a/foundation/foundation-messaging/foundation-messaging-java/src/main/java/com/boozallen/aissemble/messaging/core/cdi/MessagingCdiContext.java b/foundation/foundation-messaging/foundation-messaging-java/src/main/java/com/boozallen/aissemble/messaging/core/cdi/MessagingCdiContext.java index 53dccc9c8..ce90b2afb 100644 --- a/foundation/foundation-messaging/foundation-messaging-java/src/main/java/com/boozallen/aissemble/messaging/core/cdi/MessagingCdiContext.java +++ b/foundation/foundation-messaging/foundation-messaging-java/src/main/java/com/boozallen/aissemble/messaging/core/cdi/MessagingCdiContext.java @@ -15,13 +15,14 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; 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.WorkerPoolRegistry; import io.smallrye.reactive.messaging.providers.extension.ChannelProducer; +import io.smallrye.reactive.messaging.providers.extension.EmitterFactoryImpl; import io.smallrye.reactive.messaging.providers.extension.HealthCenter; import io.smallrye.reactive.messaging.providers.extension.MediatorManager; import io.smallrye.reactive.messaging.providers.extension.ReactiveMessagingExtension; @@ -46,6 +47,7 @@ public List> getCdiClasses() { classes.add(MediatorManager.class); classes.add(InternalChannelRegistry.class); classes.add(ConfiguredChannelFactory.class); + classes.add(EmitterFactoryImpl.class); classes.add(ChannelProducer.class); classes.add(ExecutionHolder.class); classes.add(HealthCenter.class); diff --git a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/CdiConfigurationSteps.java b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/CdiConfigurationSteps.java index 88f4c11bd..db9e2ad47 100644 --- a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/CdiConfigurationSteps.java +++ b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/CdiConfigurationSteps.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.weld.environment.se.WeldContainer; import org.slf4j.Logger; diff --git a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/TestCdiContext.java b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/TestCdiContext.java index 0a23a2ca5..e3baa8b92 100644 --- a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/TestCdiContext.java +++ b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/core/TestCdiContext.java @@ -10,7 +10,7 @@ * #L% */ -import javax.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.Extension; import java.util.ArrayList; import java.util.List; import com.boozallen.aissemble.core.cdi.CdiContext; diff --git a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/ACdiComponent.java b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/ACdiComponent.java index 0174a9357..94ff4ed09 100644 --- a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/ACdiComponent.java +++ b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/ACdiComponent.java @@ -10,7 +10,7 @@ * #L% */ -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/AnotherCdiComponent.java b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/AnotherCdiComponent.java index 7fd05c398..66b2ffa38 100644 --- a/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/AnotherCdiComponent.java +++ b/foundation/foundation-messaging/foundation-messaging-java/src/test/java/com/boozallen/aissemble/messaging/example/AnotherCdiComponent.java @@ -10,7 +10,7 @@ * #L% */ -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/MessagingService.java b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/MessagingService.java index ce28782b3..6a9b43863 100644 --- a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/MessagingService.java +++ b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/MessagingService.java @@ -20,7 +20,7 @@ import com.boozallen.aissemble.messaging.python.transfer.Callback; import com.boozallen.aissemble.messaging.python.channel.ChannelFactory; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/cdi/MessagingServiceCdiContext.java b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/cdi/MessagingServiceCdiContext.java index f1744aa51..68b62d8ca 100644 --- a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/cdi/MessagingServiceCdiContext.java +++ b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/cdi/MessagingServiceCdiContext.java @@ -14,7 +14,7 @@ import io.smallrye.reactive.messaging.amqp.AmqpConnector; import io.smallrye.reactive.messaging.kafka.KafkaCDIEvents; import io.smallrye.reactive.messaging.kafka.KafkaConnector; -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; import io.smallrye.reactive.messaging.providers.impl.ConnectorFactories; import java.util.ArrayList; diff --git a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicEmitterImpl.java b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicEmitterImpl.java index a88c38212..ca821dc1a 100644 --- a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicEmitterImpl.java +++ b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicEmitterImpl.java @@ -11,8 +11,8 @@ */ import org.eclipse.microprofile.reactive.messaging.Emitter; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.concurrent.CompletionStage; import java.util.concurrent.Future; diff --git a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicListenerImpl.java b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicListenerImpl.java index 210ce1808..ff6663994 100644 --- a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicListenerImpl.java +++ b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/main/java/com/boozallen/aissemble/messaging/python/channel/impl/TopicListenerImpl.java @@ -14,7 +14,7 @@ import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Message; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.concurrent.CompletionStage; /** diff --git a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/TestConfiguration.java b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/TestConfiguration.java index 4b05928fe..09c43f643 100644 --- a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/TestConfiguration.java +++ b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/TestConfiguration.java @@ -12,7 +12,7 @@ import io.cucumber.plugin.event.EventPublisher; import io.cucumber.plugin.event.TestRunFinished; import io.cucumber.plugin.event.TestRunStarted; -import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemoryConnector; /** * This class helps to setup the configuration before and after the cucumber tests diff --git a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/ReceiveMessageSteps.java b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/ReceiveMessageSteps.java index 25cc06a69..bdb6263c7 100644 --- a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/ReceiveMessageSteps.java +++ b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/ReceiveMessageSteps.java @@ -17,11 +17,11 @@ 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.memory.InMemoryConnector; import org.eclipse.microprofile.reactive.messaging.Message; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/SendMessageSteps.java b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/SendMessageSteps.java index c7d3c2861..0fe98fde5 100644 --- a/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/SendMessageSteps.java +++ b/foundation/foundation-messaging/foundation-messaging-python/foundation-messaging-python-service/src/test/java/com/boozallen/aissemble/messaging/python/SendMessageSteps.java @@ -17,10 +17,10 @@ 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.memory.InMemoryConnector; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/foundation/foundation-metadata/foundation-metadata-producer/pom.xml b/foundation/foundation-metadata/foundation-metadata-producer/pom.xml index a0ec368d5..b66f69408 100644 --- a/foundation/foundation-metadata/foundation-metadata-producer/pom.xml +++ b/foundation/foundation-metadata/foundation-metadata-producer/pom.xml @@ -19,6 +19,18 @@ ${project.version} pom import + + + + io.smallrye.reactive + * + + + + + io.smallrye.reactive + smallrye-reactive-messaging-api + ${version.smallrye.reactive.messaging} diff --git a/foundation/foundation-metadata/foundation-metadata-producer/src/main/java/com/boozallen/aissemble/core/metadata/producer/MetadataProducer.java b/foundation/foundation-metadata/foundation-metadata-producer/src/main/java/com/boozallen/aissemble/core/metadata/producer/MetadataProducer.java index e493aae7d..9b40ed300 100644 --- a/foundation/foundation-metadata/foundation-metadata-producer/src/main/java/com/boozallen/aissemble/core/metadata/producer/MetadataProducer.java +++ b/foundation/foundation-metadata/foundation-metadata-producer/src/main/java/com/boozallen/aissemble/core/metadata/producer/MetadataProducer.java @@ -15,8 +15,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; /** * Metadata producer diff --git a/foundation/foundation-security/foundation-pdp-client-java/src/main/java/com/boozallen/aissemble/security/client/PolicyDecisionPointProxy.java b/foundation/foundation-security/foundation-pdp-client-java/src/main/java/com/boozallen/aissemble/security/client/PolicyDecisionPointProxy.java index f73467de6..e84a8dcfa 100644 --- a/foundation/foundation-security/foundation-pdp-client-java/src/main/java/com/boozallen/aissemble/security/client/PolicyDecisionPointProxy.java +++ b/foundation/foundation-security/foundation-pdp-client-java/src/main/java/com/boozallen/aissemble/security/client/PolicyDecisionPointProxy.java @@ -13,10 +13,10 @@ import com.boozallen.aissemble.security.authorization.models.AuthRequest; import com.boozallen.aissemble.security.authorization.models.PDPRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; public interface PolicyDecisionPointProxy { @POST diff --git a/foundation/foundation-service-discovery/pom.xml b/foundation/foundation-service-discovery/pom.xml index 3d395c8b9..7ecce76bb 100644 --- a/foundation/foundation-service-discovery/pom.xml +++ b/foundation/foundation-service-discovery/pom.xml @@ -14,9 +14,9 @@ - ${project.groupId} - bom-component - ${project.version} + io.quarkus + quarkus-universe-bom + ${version.quarkus.plugin} pom import diff --git a/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryProvider.java b/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryProvider.java index 141fead43..031c5fddf 100644 --- a/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryProvider.java +++ b/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryProvider.java @@ -12,10 +12,10 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.smallrye.mutiny.Uni; import org.slf4j.Logger; diff --git a/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResource.java b/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResource.java index d963a937f..61d978a10 100644 --- a/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResource.java +++ b/foundation/foundation-service-discovery/src/main/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResource.java @@ -12,16 +12,16 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; import io.vertx.servicediscovery.Record; diff --git a/foundation/foundation-service-discovery/src/test/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResourceTest.java b/foundation/foundation-service-discovery/src/test/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResourceTest.java index 21de3a4b7..016528da0 100644 --- a/foundation/foundation-service-discovery/src/test/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResourceTest.java +++ b/foundation/foundation-service-discovery/src/test/java/com/boozallen/servicediscovery/core/ServiceDiscoveryResourceTest.java @@ -17,7 +17,7 @@ import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Test; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/pom.xml b/pom.xml index f7d361fdb..4e12b5f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -59,18 +59,19 @@ https://maven.pkg.github.com/boozallen/aissemble 1.10.1 2.7.0 - 6.10.4 + 7.4.1 1.2.0 - 4.4.1 2.30 4.13.2 2.6.0 27.7.18 2.6.0 - 3.1.4.Final + 5.1.2.Final 2.0.7 2.20.0 5.7.5 + + 1 diff --git a/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml b/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml index 57b44008c..54dd50b15 100644 --- a/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml +++ b/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -111,95 +112,95 @@ - - - org.technologybrewery.krausening - krausening - - - ${project.groupId} - foundation-core-java - - - ${project.groupId} - foundation-metadata-producer - - - ${project.groupId} - extensions-data-delivery-spark - - - ${project.groupId} - extensions-data-delivery-spark - tests - test-jar - test - ${project.version} - - - ${project.groupId} - foundation-pdp-client-java - - - org.apache.sedona - sedona-python-adapter-3.0_2.12 - ${version.sedona} - - - org.apache.sedona - sedona-viz-3.0_2.12 - ${version.sedona} - - - org.datasyslab - geotools-wrapper - ${version.geotools.wrapper} - - - ${project.groupId} - extensions-data-delivery-spark-postgres - - - org.elasticsearch - elasticsearch-spark-30_2.12 - ${version.elasticsearch} - provided - - - org.codehaus.janino - commons-compiler - ${version.janino} - - - org.codehaus.janino - janino - ${version.janino} - - - ${project.groupId} - extensions-data-delivery-spark-neo4j - - - com.boozallen.aissemble - foundation-alerting - - - com.boozallen.aissemble - foundation-encryption-policy-java - - - com.boozallen.aissemble - extensions-encryption-vault-java - - - com.boozallen.aissemble - foundation-data-lineage-java - - - io.smallrye.reactive - smallrye-reactive-messaging-kafka + + + org.technologybrewery.krausening + krausening + + + ${project.groupId} + foundation-core-java + + + ${project.groupId} + foundation-metadata-producer + + + ${project.groupId} + extensions-data-delivery-spark + + + ${project.groupId} + extensions-data-delivery-spark + tests + test-jar + test + ${project.version} + + + ${project.groupId} + foundation-pdp-client-java + + + org.apache.sedona + sedona-python-adapter-3.0_2.12 + ${version.sedona} + + + org.apache.sedona + sedona-viz-3.0_2.12 + ${version.sedona} + + + org.datasyslab + geotools-wrapper + ${version.geotools.wrapper} + + + ${project.groupId} + extensions-data-delivery-spark-postgres + + + org.elasticsearch + elasticsearch-spark-30_2.12 + ${version.elasticsearch} + provided + + + org.codehaus.janino + commons-compiler + ${version.janino} + + + org.codehaus.janino + janino + ${version.janino} + + + ${project.groupId} + extensions-data-delivery-spark-neo4j + + + com.boozallen.aissemble + foundation-alerting + + + com.boozallen.aissemble + foundation-encryption-policy-java + + + com.boozallen.aissemble + extensions-encryption-vault-java + + + com.boozallen.aissemble + foundation-data-lineage-java + + + io.smallrye.reactive + smallrye-reactive-messaging-kafka ${version.smallrye.reactive.messaging} - + io.cucumber diff --git a/test/test-mda-models/test-data-delivery-spark-model/pom.xml b/test/test-mda-models/test-data-delivery-spark-model/pom.xml index 0cb67269f..950e63849 100644 --- a/test/test-mda-models/test-data-delivery-spark-model/pom.xml +++ b/test/test-mda-models/test-data-delivery-spark-model/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -120,95 +121,95 @@ - - - org.technologybrewery.krausening - krausening - - - ${project.groupId} - foundation-core-java - - - ${project.groupId} - foundation-metadata-producer - - - ${project.groupId} - extensions-data-delivery-spark - - - ${project.groupId} - extensions-data-delivery-spark - tests - test-jar - test - ${project.version} - - - ${project.groupId} - foundation-pdp-client-java - - - org.apache.sedona - sedona-python-adapter-3.0_2.12 - ${version.sedona} - - - org.apache.sedona - sedona-viz-3.0_2.12 - ${version.sedona} - - - org.datasyslab - geotools-wrapper - ${version.geotools.wrapper} - - - ${project.groupId} - extensions-data-delivery-spark-postgres - - - org.elasticsearch - elasticsearch-spark-30_2.12 - ${version.elasticsearch} - provided - - - org.codehaus.janino - commons-compiler - ${version.janino} - - - org.codehaus.janino - janino - ${version.janino} - - - ${project.groupId} - extensions-data-delivery-spark-neo4j - - - com.boozallen.aissemble - foundation-alerting - - - com.boozallen.aissemble - foundation-encryption-policy-java - - - com.boozallen.aissemble - extensions-encryption-vault-java - - - com.boozallen.aissemble - foundation-data-lineage-java - - - io.smallrye.reactive - smallrye-reactive-messaging-kafka + + + org.technologybrewery.krausening + krausening + + + ${project.groupId} + foundation-core-java + + + ${project.groupId} + foundation-metadata-producer + + + ${project.groupId} + extensions-data-delivery-spark + + + ${project.groupId} + extensions-data-delivery-spark + tests + test-jar + test + ${project.version} + + + ${project.groupId} + foundation-pdp-client-java + + + org.apache.sedona + sedona-python-adapter-3.0_2.12 + ${version.sedona} + + + org.apache.sedona + sedona-viz-3.0_2.12 + ${version.sedona} + + + org.datasyslab + geotools-wrapper + ${version.geotools.wrapper} + + + ${project.groupId} + extensions-data-delivery-spark-postgres + + + org.elasticsearch + elasticsearch-spark-30_2.12 + ${version.elasticsearch} + provided + + + org.codehaus.janino + commons-compiler + ${version.janino} + + + org.codehaus.janino + janino + ${version.janino} + + + ${project.groupId} + extensions-data-delivery-spark-neo4j + + + com.boozallen.aissemble + foundation-alerting + + + com.boozallen.aissemble + foundation-encryption-policy-java + + + com.boozallen.aissemble + extensions-encryption-vault-java + + + com.boozallen.aissemble + foundation-data-lineage-java + + + io.smallrye.reactive + smallrye-reactive-messaging-kafka ${version.smallrye.reactive.messaging} - + io.cucumber diff --git a/test/test-mda-models/test-data-delivery-spark-model/src/test/java/com/boozallen/aiops/mda/pattern/LineageTest.java b/test/test-mda-models/test-data-delivery-spark-model/src/test/java/com/boozallen/aiops/mda/pattern/LineageTest.java index 2f6c155eb..9a4255358 100644 --- a/test/test-mda-models/test-data-delivery-spark-model/src/test/java/com/boozallen/aiops/mda/pattern/LineageTest.java +++ b/test/test-mda-models/test-data-delivery-spark-model/src/test/java/com/boozallen/aiops/mda/pattern/LineageTest.java @@ -15,8 +15,8 @@ import java.util.List; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; import org.eclipse.microprofile.reactive.messaging.Message; @@ -25,9 +25,10 @@ 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.memory.InMemoryConnector; +import io.smallrye.reactive.messaging.memory.InMemorySink; import com.boozallen.aiops.mda.pattern.pipeline.PipelineBase; +import com.boozallen.aiops.mda.pattern.Ingest; import com.boozallen.aissemble.common.Constants; import org.apache.hadoop.shaded.com.google.gson.JsonObject;