[#133] cleanup undeclared/unused dependencies

boozallen · Sep 19, 2024 · d2b609c · d2b609c
1 parent 6725fd8
commit d2b609c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml b/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml
@@ -73,9 +73,11 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-            <version>${version.jakarta.inject}</version>
+            <!-- The Jakarta inject API is not picked up by Maven, so using Javax instead -->
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${version.javax.inject}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

diff --git a/foundation/foundation-messaging/foundation-messaging-java/pom.xml b/foundation/foundation-messaging/foundation-messaging-java/pom.xml
@@ -53,9 +53,9 @@
             <version>${version.smallrye.config}</version>
         </dependency>
         <dependency>
-            <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se-core</artifactId>
-            <version>${version.weld}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${version.jakarta.cdi}</version>
         </dependency>
 
         <!-- Logging Dependencies (from aiops-parent pom) -->
@@ -85,5 +85,11 @@
             <version>${version.cucumber.reporting.plugin}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.weld.se</groupId>
+            <artifactId>weld-se-core</artifactId>
+            <version>${version.weld}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...ndation-messaging/foundation-messaging-python/foundation-messaging-python-service/pom.xml b/...ndation-messaging/foundation-messaging-python/foundation-messaging-python-service/pom.xml
@@ -39,6 +39,11 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>com.boozallen.aissemble</groupId>
+            <artifactId>foundation-core-java</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.boozallen.aissemble</groupId>
             <artifactId>foundation-messaging-java</artifactId>
@@ -49,6 +54,16 @@
             <artifactId>smallrye-reactive-messaging-provider</artifactId>
             <version>${version.smallrye.reactive.messaging}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.weld.se</groupId>
+            <artifactId>weld-se-core</artifactId>
+            <version>${version.weld}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${version.jakarta.inject}</version>
+        </dependency>
 
         <!-- messaging implementations -->
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,6 @@
         <version.slf4j>2.0.7</version.slf4j>
         <version.log4j>2.20.0</version.log4j>
         <version.cucumber.reporting.plugin>5.7.5</version.cucumber.reporting.plugin>
-        <!-- NB: After Java 17 upgrade, we may not need this -->
         <version.javax.inject>1</version.javax.inject>
     </properties>