Merge pull request #349 from boozallen/133-upgrade-java17-foundation-…

…modules #133 upgrade java17 foundation core modules
boozallen · Sep 19, 2024 · a490325 · a490325
2 parents 7de77e9 + b131b1b
commit a490325
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 27 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -28,30 +28,30 @@
         <!-- Plugins versions -->
         <!-- **************** -->
         <version.archetype.plugin>3.2.1</version.archetype.plugin>
-        <version.assembly.plugin>3.6.0</version.assembly.plugin>
-        <version.buildhelper.plugin>3.2.0</version.buildhelper.plugin>
-        <version.buildnumber.plugin>3.1.0</version.buildnumber.plugin>
+        <version.assembly.plugin>3.7.1</version.assembly.plugin>
+        <version.buildhelper.plugin>3.6.0</version.buildhelper.plugin>
+        <version.buildnumber.plugin>3.2.1</version.buildnumber.plugin>
         <version.failsafe.plugin>${version.maven.surefire.plugin}</version.failsafe.plugin>
         <version.fermenter>2.10.3</version.fermenter>
         <version.fermenter.legacy.tools>2.8.0</version.fermenter.legacy.tools>
         <version.habushu.plugin>2.16.1</version.habushu.plugin>
         <version.python>3.11.4</version.python>
-        <version.help.plugin>3.2.0</version.help.plugin>
+        <version.help.plugin>3.5.0</version.help.plugin>
         <version.krausening>19</version.krausening>
         <version.plexus.archiver>3.6.0</version.plexus.archiver>
         <version.plugin.plugin>3.9.0</version.plugin.plugin>
         <version.quarkus>3.6.9</version.quarkus>
         <version.quarkus.plugin>${version.quarkus}</version.quarkus.plugin>
-        <version.shade.plugin>3.2.4</version.shade.plugin>
+        <version.shade.plugin>3.6.0</version.shade.plugin>
         <version.smallrye.config>3.9.1</version.smallrye.config>
         <version.smallrye.graphql>2.9.1</version.smallrye.graphql>
         <version.smallrye.reactive.messaging>4.24.0</version.smallrye.reactive.messaging>
         <version.orphedomos.plugin>0.10.1</version.orphedomos.plugin>
         <version.janino>3.0.8</version.janino>
-        <version.jackson>2.14.2</version.jackson>
+        <version.jackson>2.15.0</version.jackson>
         <version.jclouds>2.6.0</version.jclouds>
         <version.maven.core>3.8.6</version.maven.core>
-        <version.mutiny>1.4.0</version.mutiny>
+        <version.mutiny>2.6.2</version.mutiny>
         <version.plexus.component>2.1.1</version.plexus.component>
         <version.postgresql>42.5.1</version.postgresql>
         <version.resteasy>4.7.7.Final</version.resteasy>
@@ -119,7 +119,7 @@
         <!-- maven-enforcer-plugin -->
         <version.maven.min>3.6.2</version.maven.min>
         <version.jdk.required>${maven.compiler.argument.source}</version.jdk.required>
-        <version.jdk.next-unsupported>12</version.jdk.next-unsupported>
+        <version.jdk.next-unsupported>18</version.jdk.next-unsupported>
         <insecure.repositories>ERROR</insecure.repositories>
 
         <!-- maven-idea-plugin & maven-eclipse-plugin -->

diff --git a/build-support/aissemble-enforcer-extension/pom.xml b/build-support/aissemble-enforcer-extension/pom.xml
@@ -15,8 +15,6 @@
         <version.maven.core>3.8.6</version.maven.core>
         <version.junit>4.13.2</version.junit>
         <version.cucumber>6.10.4</version.cucumber>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/foundation/foundation-alerting/pom.xml b/foundation/foundation-alerting/pom.xml
@@ -67,7 +67,7 @@
             <version>${version.jakarta.inject}</version>
         </dependency>
 
-        <!-- Logging Dependencies (from aiops-parent pom) -->
+        <!-- Logging Dependencies (from aissemble-parent pom) -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/foundation/foundation-archetype/pom.xml b/foundation/foundation-archetype/pom.xml
@@ -68,7 +68,7 @@
             <extension>
                 <groupId>org.apache.maven.archetype</groupId>
                 <artifactId>archetype-packaging</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
             </extension>
         </extensions>
         <plugins>
@@ -89,7 +89,7 @@
             <!-- Generally we don't want to use the maven-antrun-plugin but we are using it here as the most sensible copy/rename option -->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -143,7 +143,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>test-project-archetype</id>

diff --git a/foundation/foundation-maven-plugins/artifacts-maven-plugin/pom.xml b/foundation/foundation-maven-plugins/artifacts-maven-plugin/pom.xml
@@ -14,7 +14,6 @@
 
     <properties>
         <!-- versions for plugin specific dependencies-->
-        <version.mojo.executor>2.4.0</version.mojo.executor>
         <version.testing.harness>3.3.0</version.testing.harness>
         <version.exec.plugin>3.1.0</version.exec.plugin>
         <version.cucumber>7.17.0</version.cucumber>

diff --git a/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml b/foundation/foundation-maven-plugins/foundation-model-plugin/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-interactivity-api</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
@@ -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/...ns/mda-maven-plugin/src/main/java/com/boozallen/mda/maven/mojo/PipelineArtifactsMojo.java b/...ns/mda-maven-plugin/src/main/java/com/boozallen/mda/maven/mojo/PipelineArtifactsMojo.java
@@ -338,7 +338,7 @@ public void retrieveSparkApplications(String pipelineName, Path archiveDir, Pipe
                 throw new NoSuchFileException("No archive present in directory " + archiveDir);
             }
             Path archive = archiveOpt.get();
-            FileSystem fileSystem = FileSystems.newFileSystem(archive, null);
+            FileSystem fileSystem = FileSystems.newFileSystem(archive, (ClassLoader) null);
             Path appsDirToExtract = fileSystem.getPath(getPathToValuesFileDir(implType, pipelineName));
             Files.walk(appsDirToExtract, 1).forEach((fileToExtract -> {
                 try {

diff --git a/foundation/foundation-mda/pom.xml b/foundation/foundation-mda/pom.xml
@@ -47,7 +47,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>create-generator-usage-comments</id>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.3.1</version>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.boozallen.aissemble</groupId>

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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boozallen.aissemble</groupId>
         <artifactId>aissemble-parent</artifactId>
-        <version>4</version>
+        <version>5</version>
         <relativePath/>
     </parent>
 
@@ -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>