Fix some merge issues

Author: scottgerring

.github/workflows/pr_build.yml

@@ -26,6 +26,7 @@ on:
   push:
     branches:
       - main
+      - v2
     paths:
       - 'powertools-batch/**'
       - 'powertools-cloudformation/**'

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>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

powertools-parameters/powertools-parameters-dynamodb/pom.xml

@@ -36,6 +36,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

powertools-parameters/powertools-parameters-secrets/pom.xml

@@ -36,6 +36,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

powertools-parameters/powertools-parameters-ssm/pom.xml

@@ -36,6 +36,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

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>

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>