update parent pom

aws-powertools · Nov 22, 2022 · 15db476 · 15db476
1 parent 6e588dc
commit 15db476
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,6 +30,8 @@
         <module>powertools-core</module>
         <module>powertools-serialization</module>
         <module>powertools-logging</module>
+        <module>powertools-logging-log4j</module>
+        <module>powertools-logging-logback</module>
         <module>powertools-tracing</module>
         <module>powertools-sqs</module>
         <module>powertools-metrics</module>
@@ -56,6 +58,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <log4j.version>2.19.0</log4j.version>
+        <slf4j.version>2.0.4</slf4j.version>
         <jackson.version>2.14.1</jackson.version>
         <aspectj.version>1.9.7</aspectj.version>
         <aws.sdk.version>2.18.22</aws.sdk.version>
@@ -77,6 +80,7 @@
         <junit-jupiter.version>5.9.1</junit-jupiter.version>
         <aws-embedded-metrics.version>1.0.6</aws-embedded-metrics.version>
         <jmespath.version>0.5.1</jmespath.version>
+        <elastic.version>1.5.0</elastic.version>
     </properties>
 
     <distributionManagement>
@@ -175,6 +179,11 @@
                 <artifactId>log4j-slf4j-impl</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j2-impl</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
@@ -190,6 +199,16 @@
                 <artifactId>log4j-jcl</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>co.elastic.logging</groupId>
+                <artifactId>logback-ecs-encoder</artifactId>
+                <version>${elastic.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-xray-recorder-sdk-core</artifactId>

diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
@@ -12,22 +12,6 @@
     <Match>
         <Bug pattern="EI_EXPOSE_REP"/>
         <Or>
-            <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.LambdaJsonLayout$LogEventWithAdditionalFields"/>
-                <Method name="getLogEvent"/>
-            </And>
-            <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.LambdaJsonLayout$LogEventWithAdditionalFields"/>
-                <Method name="getAdditionalFields"/>
-            </And>
-            <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.AbstractJacksonLayoutCopy$Builder"/>
-                <Method name="getAdditionalFields"/>
-            </And>
-            <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.AbstractJacksonLayoutCopy$LogEventWithAdditionalFields"/>
-                <Method name="getAdditionalFields"/>
-            </And>
             <And>
                 <Class name="software.amazon.lambda.powertools.idempotency.Idempotency"/>
                 <Method name="getPersistenceStore"/>
@@ -38,20 +22,12 @@
         <Bug pattern="EI_EXPOSE_REP2"/>
         <Or>
             <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.LambdaJsonLayout$LogEventWithAdditionalFields"/>
-                <Field name="logEvent"/>
-            </And>
-            <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.LambdaJsonLayout$LogEventWithAdditionalFields"/>
-                <Field name="additionalFields"/>
-            </And>
-            <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.AbstractJacksonLayoutCopy$Builder"/>
-                <Field name="additionalFields"/>
+                <Class name="software.amazon.lambda.powertools.logging.LambdaJsonEncoder"/>
+                <Field name="throwableConverter"/>
             </And>
             <And>
-                <Class name="software.amazon.lambda.powertools.logging.internal.AbstractJacksonLayoutCopy$LogEventWithAdditionalFields"/>
-                <Field name="additionalFields"/>
+                <Class name="software.amazon.lambda.powertools.logging.LambdaEcsEncoder"/>
+                <Field name="throwableConverter"/>
             </And>
             <And>
                 <Class name="software.amazon.lambda.powertools.sqs.internal.BatchContext"/>