fix: Roll log4j shade transformer forwards (#1376)

* Roll log4j shade transformer forwards * missed one
aws-powertools · Aug 18, 2023 · 29f71dd · 29f71dd
1 parent 424f888
commit 29f71dd
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 44 deletions.
diff --git a/examples/powertools-examples-batch/pom.xml b/examples/powertools-examples-batch/pom.xml
@@ -107,18 +107,16 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                                </transformer>
+                                <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                             </transformers>
                         </configuration>
                     </execution>
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>com.github.edwgiz</groupId>
-                        <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                        <version>2.15</version>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                        <version>0.1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/examples/powertools-examples-cloudformation/pom.xml b/examples/powertools-examples-cloudformation/pom.xml
@@ -132,18 +132,16 @@
                     </goals>
                     <configuration>
                         <transformers>
-                            <transformer
-                                    implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                            </transformer>
+                            <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                         </transformers>
                     </configuration>
                 </execution>
             </executions>
             <dependencies>
                 <dependency>
-                    <groupId>com.github.edwgiz</groupId>
-                    <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                    <version>2.15</version>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                    <version>0.1.0</version>
                 </dependency>
             </dependencies>
         </plugin>

diff --git a/examples/powertools-examples-core/cdk/app/pom.xml b/examples/powertools-examples-core/cdk/app/pom.xml
@@ -107,18 +107,16 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                                </transformer>
+                                <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                             </transformers>
                         </configuration>
                     </execution>
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>com.github.edwgiz</groupId>
-                        <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                        <version>2.15</version>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                        <version>0.1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/examples/powertools-examples-core/sam/pom.xml b/examples/powertools-examples-core/sam/pom.xml
@@ -106,18 +106,16 @@
                     </goals>
                     <configuration>
                         <transformers>
-                            <transformer
-                                    implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                            </transformer>
+                            <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                         </transformers>
                     </configuration>
                 </execution>
             </executions>
             <dependencies>
                 <dependency>
-                    <groupId>com.github.edwgiz</groupId>
-                    <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                    <version>2.15</version>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                    <version>0.1.0</version>
                 </dependency>
             </dependencies>
         </plugin>

diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
@@ -169,18 +169,16 @@
                     </goals>
                     <configuration>
                         <transformers>
-                            <transformer
-                                    implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                            </transformer>
+                            <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                         </transformers>
                     </configuration>
                 </execution>
             </executions>
             <dependencies>
                 <dependency>
-                    <groupId>com.github.edwgiz</groupId>
-                    <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                    <version>2.15</version>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                    <version>0.1.0</version>
                 </dependency>
             </dependencies>
         </plugin>

diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
@@ -105,18 +105,16 @@
                     </goals>
                     <configuration>
                         <transformers>
-                            <transformer
-                                    implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                            </transformer>
+                            <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                         </transformers>
                     </configuration>
                 </execution>
             </executions>
             <dependencies>
                 <dependency>
-                    <groupId>com.github.edwgiz</groupId>
-                    <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                    <version>2.15</version>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                    <version>0.1.0</version>
                 </dependency>
             </dependencies>
         </plugin>

diff --git a/powertools-e2e-tests/handlers/pom.xml b/powertools-e2e-tests/handlers/pom.xml
@@ -120,19 +120,17 @@
                             </goals>
                             <configuration>
                                 <transformers>
-                                    <transformer
-                                            implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer">
-                                    </transformer>
+                                    <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                                 </transformers>
                             </configuration>
                         </execution>
                     </executions>
                     <dependencies>
-                        <dependency>
-                            <groupId>io.github.edwgiz</groupId>
-                            <artifactId>log4j-maven-shade-plugin-extensions</artifactId>
-                            <version>2.17.2</version>
-                        </dependency>
+                      <dependency>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                        <version>0.1.0</version>
+                       </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>