From 6a3be41d7d7026ac85e32c672fc1568ffe635719 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Tue, 13 Feb 2024 15:00:25 +0100
Subject: [PATCH] Fix some merge issues

---
 .github/workflows/pr_build.yml                              | 1 +
 .../powertools-parameters-appconfig/pom.xml                 | 6 +++++-
 .../powertools-parameters-dynamodb/pom.xml                  | 5 +++++
 powertools-parameters/powertools-parameters-secrets/pom.xml | 5 +++++
 powertools-parameters/powertools-parameters-ssm/pom.xml     | 5 +++++
 powertools-validation/pom.xml                               | 5 +++++
 spotbugs-exclude.xml                                        | 4 ++++
 7 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index e86f49753..5373f4b4c 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -26,6 +26,7 @@ on:
   push:
     branches:
       - main
+      - v2
     paths:
       - 'powertools-batch/**'
       - 'powertools-cloudformation/**'
diff --git a/powertools-parameters/powertools-parameters-appconfig/pom.xml b/powertools-parameters/powertools-parameters-appconfig/pom.xml
index 3a3018c7c..e673c67b9 100644
--- a/powertools-parameters/powertools-parameters-appconfig/pom.xml
+++ b/powertools-parameters/powertools-parameters-appconfig/pom.xml
@@ -21,7 +21,6 @@
             <artifactId>powertools-parameters</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>appconfigdata</artifactId>
@@ -36,6 +35,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>${aspectj.version}</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/powertools-parameters/powertools-parameters-dynamodb/pom.xml b/powertools-parameters/powertools-parameters-dynamodb/pom.xml
index ad32bdff8..3852c4489 100644
--- a/powertools-parameters/powertools-parameters-dynamodb/pom.xml
+++ b/powertools-parameters/powertools-parameters-dynamodb/pom.xml
@@ -36,6 +36,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>${aspectj.version}</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/powertools-parameters/powertools-parameters-secrets/pom.xml b/powertools-parameters/powertools-parameters-secrets/pom.xml
index 6c4501ca3..06a4f43a9 100644
--- a/powertools-parameters/powertools-parameters-secrets/pom.xml
+++ b/powertools-parameters/powertools-parameters-secrets/pom.xml
@@ -36,6 +36,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>${aspectj.version}</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/powertools-parameters/powertools-parameters-ssm/pom.xml b/powertools-parameters/powertools-parameters-ssm/pom.xml
index 80276189d..5d8af41cd 100644
--- a/powertools-parameters/powertools-parameters-ssm/pom.xml
+++ b/powertools-parameters/powertools-parameters-ssm/pom.xml
@@ -36,6 +36,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>${aspectj.version}</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/powertools-validation/pom.xml b/powertools-validation/pom.xml
index a5fc4a890..0de38c1c1 100644
--- a/powertools-validation/pom.xml
+++ b/powertools-validation/pom.xml
@@ -33,6 +33,11 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
             <artifactId>powertools-common</artifactId>
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
index ff6b64fbc..ee39b5d0f 100644
--- a/spotbugs-exclude.xml
+++ b/spotbugs-exclude.xml
@@ -30,6 +30,8 @@
             <And>
                 <Class name="software.amazon.lambda.powertools.largemessages.LargeMessageConfig"/>
                 <Method name="getS3Client"/>
+            </And>
+            <And>
                 <Class name="software.amazon.lambda.powertools.parameters.secrets.SecretsProviderBuilder"/>
                 <Field name="cacheManager"/>
             </And>
@@ -111,6 +113,8 @@
             <And>
                 <Class name="software.amazon.lambda.powertools.parameters.transform.TransformationManager"/>
                 <Field name="transformer"/>
+            </And>
+            <And>
                 <Class name="software.amazon.lambda.powertools.logging.logback.LambdaEcsEncoder"/>
                 <Field name="throwableConverter"/>
             </And>