Upgrade aws-lambda-java-log4j2 to 1.5.0 to upgrade log4j2 to 2.17.0 (a…

…wslabs#166) * upgrade aws-lambda-java-log4j2 to 1.5.0 to upgrade log4j2 to 2.17.0 * apply logging standardization across all connected modules * Upgrade log4j2 to 2.17.1 and aws-lambda-java-log4j to 1.5.1 * exclude log4j-core and api from lambda logging, use from log4j-slf4j-impl * Remove explicit log4j-slf4j-impl from custom-resources * Move log4j-slf4j-impl to layers parent and mark as provided to avoid class conflict Co-authored-by: PoeppingT <[email protected]>
netapp-vedantsethia · Jan 5, 2022 · fe3bf7c · fe3bf7c
1 parent 8241dee
commit fe3bf7c
Show file tree

Hide file tree

Showing 26 changed files with 34 additions and 154 deletions.
diff --git a/functions/alb-update/pom.xml b/functions/alb-update/pom.xml
@@ -114,12 +114,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/functions/ecs-deploy/pom.xml b/functions/ecs-deploy/pom.xml
@@ -114,12 +114,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/functions/ecs-service-update/pom.xml b/functions/ecs-service-update/pom.xml
@@ -107,12 +107,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/functions/ecs-shutdown-services/pom.xml b/functions/ecs-shutdown-services/pom.xml
@@ -114,12 +114,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/functions/ecs-startup-services/pom.xml b/functions/ecs-startup-services/pom.xml
@@ -114,12 +114,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/functions/onboarding-notification/pom.xml b/functions/onboarding-notification/pom.xml
@@ -107,12 +107,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>

diff --git a/functions/system-rest-api-client/pom.xml b/functions/system-rest-api-client/pom.xml
@@ -114,12 +114,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/installer/pom.xml b/installer/pom.xml
@@ -119,21 +119,6 @@ limitations under the License.
             <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.17.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>cloudformation</artifactId>

diff --git a/layers/pom.xml b/layers/pom.xml
@@ -40,4 +40,12 @@
             </plugins>
         </pluginManagement>
     </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/layers/utils/pom.xml b/layers/utils/pom.xml
@@ -56,11 +56,6 @@ limitations under the License.
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

diff --git a/metering-billing/lambdas/pom.xml b/metering-billing/lambdas/pom.xml
@@ -115,12 +115,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/metrics-analytics/metrics-java-sdk/pom.xml b/metrics-analytics/metrics-java-sdk/pom.xml
@@ -67,12 +67,6 @@ limitations under the License.
             <version>2.11.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -34,9 +34,10 @@
         <!-- TODO upgrade to surefire 3 on release? -->
         <surefire.version>2.22.2</surefire.version>
         <!-- dependency versions -->
-        <slf4j-api.version>1.7.21</slf4j-api.version>
-        <slf4j-log4j12.version>1.7.21</slf4j-log4j12.version>
+        <!-- aws-lambda-java-log4j2 and log4j versions should be upgraded in tandem -->
+        <aws-lambda-java-log4j2.version>1.5.1</aws-lambda-java-log4j2.version>
         <aws.java.sdk.version>2.17.70</aws.java.sdk.version>
+        <log4j.version>2.17.1</log4j.version>
         <junit.version>4.13.2</junit.version>
     </properties>
     <dependencyManagement>
@@ -47,8 +48,31 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-lambda-java-log4j2</artifactId>
+                <version>${aws-lambda-java-log4j2.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <!-- log4j-slf4j-impl brings in its own version of the slf4j-api -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+    </dependencies>
     <build>
         <defaultGoal>clean package</defaultGoal>
         <!-- this defines default plugin configuration when referenced by all inheriting modules -->

diff --git a/resources/custom-resources/cidr-dynamodb/pom.xml b/resources/custom-resources/cidr-dynamodb/pom.xml
@@ -106,12 +106,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/resources/custom-resources/clear-s3-bucket/pom.xml b/resources/custom-resources/clear-s3-bucket/pom.xml
@@ -102,12 +102,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/resources/custom-resources/disable-instance-protection/pom.xml b/resources/custom-resources/disable-instance-protection/pom.xml
@@ -106,12 +106,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/resources/custom-resources/fsx-dns-name/pom.xml b/resources/custom-resources/fsx-dns-name/pom.xml
@@ -106,12 +106,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/resources/custom-resources/rds-bootstrap/pom.xml b/resources/custom-resources/rds-bootstrap/pom.xml
@@ -99,12 +99,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/resources/custom-resources/rds-options/pom.xml b/resources/custom-resources/rds-options/pom.xml
@@ -102,12 +102,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/resources/custom-resources/redshift-table/pom.xml b/resources/custom-resources/redshift-table/pom.xml
@@ -102,12 +102,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.amazon.redshift/redshift-jdbc42 -->
         <dependency>

diff --git a/services/metric-service/pom.xml b/services/metric-service/pom.xml
@@ -114,12 +114,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/services/onboarding-service/pom.xml b/services/onboarding-service/pom.xml
@@ -114,12 +114,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/services/quotas-service/pom.xml b/services/quotas-service/pom.xml
@@ -107,12 +107,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/services/settings-service/pom.xml b/services/settings-service/pom.xml
@@ -139,12 +139,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/services/tenant-service/pom.xml b/services/tenant-service/pom.xml
@@ -107,12 +107,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diff --git a/services/user-service/pom.xml b/services/user-service/pom.xml
@@ -107,12 +107,6 @@ limitations under the License.
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>