[#263] general cleanup

- pull scala version up to build-parent - fix relative parent path warning - remove unused imports - remove unused inf recursion - fix package path - fix string utils import - rename smallrye graphql version property - move logging dependencies up to root so they can be used in build-support - add more Apache commons to root - remove unused incremental build profile - remove unused fields/imports - add plugin version to cucumberin build-support - de-duplicate fabric8 conf in spark-infrastructure - remove pom/bom import from dependencies in invocation-service - fix templates (bom removal and groupId fix) - simplify pipeline CDI with composition
boozallen · Aug 30, 2024 · 671fa93 · 671fa93
1 parent cec2ee2
commit 671fa93
Show file tree

Hide file tree

Showing 120 changed files with 251 additions and 690 deletions.
diff --git a/bom/bom-component/pom.xml b/bom/bom-component/pom.xml
@@ -61,17 +61,17 @@
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-graphql-client</artifactId>
-                <version>${version.smallrye.plugin}</version>
+                <version>${version.smallrye.graphql}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-graphql-client-api</artifactId>
-                <version>${version.smallrye.plugin}</version>
+                <version>${version.smallrye.graphql}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-graphql-client-implementation-vertx</artifactId>
-                <version>${version.smallrye.plugin}</version>
+                <version>${version.smallrye.graphql}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
@@ -119,7 +119,7 @@
             <dependency>
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
-                <version>4.0.3</version>
+                <version>${version.awaitility}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -44,13 +44,12 @@
         <version.quarkus.plugin>${version.quarkus}</version.quarkus.plugin>
         <version.shade.plugin>3.2.4</version.shade.plugin>
         <version.smallrye.config>1.12.0</version.smallrye.config>
-        <version.smallrye.plugin>1.6.0</version.smallrye.plugin>
+        <version.smallrye.graphql>1.6.0</version.smallrye.graphql>
         <version.smallrye.reactive.messaging>3.15.0</version.smallrye.reactive.messaging>
         <version.orphedomos.plugin>0.10.1</version.orphedomos.plugin>
         <version.janino>3.0.8</version.janino>
         <version.jackson>2.13.2</version.jackson>
         <version.jclouds>2.5.0</version.jclouds>
-        <version.log4j>2.20.0</version.log4j>
         <version.maven.core>3.8.6</version.maven.core>
         <version.mutiny>0.5.0</version.mutiny>
         <version.plexus.component>2.1.1</version.plexus.component>
@@ -62,13 +61,14 @@
         <version.uvicorn>&gt;=0.18.0</version.uvicorn>
         <version.cryptography>&gt;=42.0.4</version.cryptography>
         <version.python.krausening>&gt;=${version.krausening}</version.python.krausening>
-        <version.slf4j>2.0.7</version.slf4j>
         <version.delta.hive.connector>0.6.0</version.delta.hive.connector>
         <version.testcontainers>1.19.8</version.testcontainers>
         <version.vault>5.1.0</version.vault>
+        <version.awaitility>4.0.3</version.awaitility>
 
 <!--        Spark Default Dependencies.  See `spark-*` profiles below for alternative sets -->
         <version.spark>3.4.0</version.spark>
+        <version.scala>2.12.1</version.scala>
         <version.delta>2.4.0</version.delta>
         <version.elasticsearch>8.9.0</version.elasticsearch>
         <version.sedona>1.4.0</version.sedona>
@@ -149,26 +149,6 @@
     <dependencyManagement>
         <!-- NB: Why are these here and not with the other dependencies? -->
         <dependencies>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-core</artifactId>
-                <version>${version.log4j}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-api</artifactId>
-                <version>${version.log4j}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j2-impl</artifactId>
-                <version>${version.log4j}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${version.slf4j}</version>
-            </dependency>
             <dependency>
                 <groupId>net.masterthought</groupId>
                 <artifactId>cucumber-reporting</artifactId>
@@ -1109,33 +1089,6 @@ To suppress enforce-helm-version rule, you must add following plugin to the root
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>incremental</id>
-            <activation>
-                <property>
-                    <name>incremental</name>
-                </property>
-            </activation>
-            <properties>
-                <!-- the *local* dev, not refs/remotes/... -->
-                <gib.referenceBranch>dev</gib.referenceBranch>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.github.gitflow-incremental-builder</groupId>
-                        <artifactId>gitflow-incremental-builder</artifactId>
-                        <version>${version.gitflow-incremental-builder}</version>
-                        <extensions>true</extensions>
-                        <!-- https://github.com/gitflow-incremental-builder/gitflow-incremental-builder#configuration
-                             General recap: Anything that is directly set in <configuration> cannot be redefined via '-D...'!
-                             See also: https://github.com/gitflow-incremental-builder/gitflow-incremental-builder/issues/213 -->
-                        <configuration>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>hide-manual-actions</id>
             <activation>

diff --git a/build-support/aissemble-enforcer-extension/pom.xml b/build-support/aissemble-enforcer-extension/pom.xml
@@ -31,6 +31,11 @@
             <artifactId>enforcer-rules</artifactId>
             <version>${version.maven.enforcer.plugin}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${version.maven.core}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
@@ -39,12 +44,22 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-exec</artifactId>
-            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
 
 
@@ -90,6 +105,7 @@
             <plugin>
                 <groupId>net.masterthought</groupId>
                 <artifactId>maven-cucumber-reporting</artifactId>
+                <version>${version.cucumber.reporting.plugin}</version>
             </plugin>
         </plugins>
     </build>

diff --git a/...er-extension/src/main/java/com/boozallen/aissemble/maven/enforcer/EnforceHelmVersion.java b/...er-extension/src/main/java/com/boozallen/aissemble/maven/enforcer/EnforceHelmVersion.java
@@ -10,7 +10,6 @@
  * #L%
  */
 
-import java.io.File;
 import javax.inject.Named;
 import javax.inject.Inject;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
@@ -21,7 +20,7 @@
 import org.apache.maven.enforcer.rules.AbstractStandardEnforcerRule;
 import org.apache.maven.enforcer.rules.utils.ArtifactMatcher;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.boozallen.aissemble.maven.enforcer.helper.HelmVersionHelper;
 

diff --git a/...ension/src/main/java/com/boozallen/aissemble/maven/enforcer/helper/HelmVersionHelper.java b/...ension/src/main/java/com/boozallen/aissemble/maven/enforcer/helper/HelmVersionHelper.java
@@ -18,7 +18,6 @@
 import java.util.regex.Matcher;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;

diff --git a/...erting-slack/src/test/java/com/boozallen/aissemble/alerting/slack/SlackAlertingSteps.java b/...erting-slack/src/test/java/com/boozallen/aissemble/alerting/slack/SlackAlertingSteps.java
@@ -13,8 +13,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 
 import com.boozallen.aissemble.alerting.slack.cdi.SlackCdiContext;

diff --git a/extensions/extensions-data-delivery/extensions-data-delivery-spark/pom.xml b/extensions/extensions-data-delivery/extensions-data-delivery-spark/pom.xml
@@ -47,18 +47,6 @@
         </plugins>
     </build>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.boozallen.aissemble</groupId>
-                <artifactId>bom-component</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

diff --git a/...c/test/java/com/boozallen/aiops/data/delivery/spark/testutils/SparkApplicationConfig.java b/...c/test/java/com/boozallen/aiops/data/delivery/spark/testutils/SparkApplicationConfig.java
@@ -16,7 +16,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

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
@@ -12,13 +12,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.boozallen.aissemble</groupId>
-                <artifactId>bom-component</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bom</artifactId>
@@ -68,11 +61,6 @@
         </dependency>
 
         <!--    SMALLRYE CONNECTORS-->
-        <dependency>
-            <groupId>io.smallrye.reactive</groupId>
-            <artifactId>smallrye-reactive-messaging-in-memory</artifactId>
-            <version>${version.smallrye.reactive.messaging}</version>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-reactive-messaging-amqp</artifactId>

diff --git a/...vice/src/test/java/com/boozallen/aissemble/datalineage/consumer/MessageHandlingSteps.java b/...vice/src/test/java/com/boozallen/aissemble/datalineage/consumer/MessageHandlingSteps.java
@@ -22,9 +22,10 @@
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 import io.openlineage.client.OpenLineageClientUtils;
-import org.eclipse.microprofile.reactive.messaging.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Emitter;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.OnOverflow;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -35,7 +36,11 @@
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.ok;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -51,8 +56,6 @@ public class MessageHandlingSteps {
     @Inject
     LineageMessageHandler messageHandler;
 
-    private final Logger logger = LoggerFactory.getLogger(MessageHandlingSteps.class);
-
     /**
      * Replaces the default ack/nack functions with logic to mark their outflow in the context map for future reference.
      */

diff --git a/...e/extensions-data-lineage-http-consumer-service/src/test/resources/application.properties b/...e/extensions-data-lineage-http-consumer-service/src/test/resources/application.properties
@@ -8,7 +8,9 @@
 # #L%
 ###
 quarkus.rest-client."com.boozallen.aissemble.datalineage.consumer.HttpProducerService".uri=http://127.0.0.1:15100/endpoint
-quarkus.amqp.devservices.image-name=quay.io/artemiscloud/activemq-artemis-broker:1.0.26
+quarkus.amqp.devservices.image-name=quay.io/artemiscloud/activemq-artemis-broker:1.0.25
+#Artemis image requires --user arg to startup and this fixes the issue, see https://github.com/quarkusio/quarkus/issues/36190
+quarkus.amqp.devservices.extra-args=--no-autotune --mapped --no-fsync --relax-jolokia
 quarkus.kafka.devservices.image-name=vectorized/redpanda:v24.1.7
 com.boozallen.aissemble.datalineage.consumer.HttpProducer/postEventHttp/Retry/maxRetries=5
-com.boozallen.aissemble.datalineage.consumer.HttpProducer/postEventHttp/Retry/delay=1
+com.boozallen.aissemble.datalineage.consumer.HttpProducer/postEventHttp/Retry/delay=1
diff --git a/extensions/extensions-docker/aissemble-spark-infrastructure/pom.xml b/extensions/extensions-docker/aissemble-spark-infrastructure/pom.xml
@@ -64,6 +64,7 @@
                             <build>
                                 <args>
                                     <JARS_DIR>${dockerbuild.jars.directory}</JARS_DIR>
+                                    <DELTA_HIVE_CONNECTOR_VERSION>${version.delta.hive.connector}</DELTA_HIVE_CONNECTOR_VERSION>
                                 </args>
                             </build>
                         </image>
@@ -88,21 +89,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <configuration>
-                    <images>
-                        <image>
-                            <build>
-                                <args>
-                                    <DELTA_HIVE_CONNECTOR_VERSION>${version.delta.hive.connector}</DELTA_HIVE_CONNECTOR_VERSION>
-                                </args>
-                            </build>
-                        </image>
-                    </images>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/...on-vault-java/src/main/java/com/boozallen/aissemble/data/encryption/SimpleAesEncrypt.java b/...on-vault-java/src/main/java/com/boozallen/aissemble/data/encryption/SimpleAesEncrypt.java
@@ -14,8 +14,6 @@
 import com.boozallen.aissemble.data.encryption.exception.AiopsEncryptException;
 
 import org.aeonbits.owner.KrauseningConfigFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -35,7 +33,6 @@
  */
 public class SimpleAesEncrypt implements AiopsEncrypt {
 
-    private static final Logger logger = LoggerFactory.getLogger(SimpleAesEncrypt.class);
     private static final DataEncryptionConfiguration config = KrauseningConfigFactory.create(DataEncryptionConfiguration.class);
 
     /**

diff --git a/extensions/extensions-metadata-service/pom.xml b/extensions/extensions-metadata-service/pom.xml
@@ -75,9 +75,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.boozallen.aissemble</groupId>
-                <artifactId>bom-component</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-universe-bom</artifactId>
+                <version>${version.quarkus.plugin}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -135,6 +135,12 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-openapi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.slf4j</groupId>
+                    <artifactId>slf4j-jboss-logmanager</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/...tensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataService.java b/...tensions-metadata-service/src/main/java/com/boozallen/aiops/metadata/MetadataService.java
@@ -12,8 +12,6 @@
 
 import com.boozallen.aissemble.core.metadata.MetadataAPI;
 import com.boozallen.aissemble.core.metadata.MetadataModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.ws.rs.GET;
@@ -26,7 +24,6 @@
 
 @Path("/metadata")
 public class MetadataService {
-    private static final Logger logger = LoggerFactory.getLogger(MetadataService.class);
 
     @Inject
     @MetadataAPIType("hive")