From e1c741f2abbbc3c5603e55e9b6609dfa12dd6305 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Thu, 17 Aug 2023 10:35:58 +0200
Subject: [PATCH 1/2] Roll log4j shade transformer forwards

---
 examples/powertools-examples-batch/pom.xml          | 10 ++++------
 examples/powertools-examples-cloudformation/pom.xml | 10 ++++------
 examples/powertools-examples-core/cdk/app/pom.xml   | 10 ++++------
 examples/powertools-examples-core/sam/pom.xml       | 10 ++++------
 examples/powertools-examples-idempotency/pom.xml    | 10 ++++------
 examples/powertools-examples-sqs/pom.xml            | 10 ++++------
 6 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/examples/powertools-examples-batch/pom.xml b/examples/powertools-examples-batch/pom.xml
index d3c4bc49b..90e9eea43 100644
--- 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
index 8ce21299d..c6c12e4d9 100644
--- 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
index a4359e223..7b57bd55d 100644
--- 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
index bc3667b4f..f1bffb896 100644
--- 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
index f24b2ffc4..533f6acfd 100644
--- 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
index e50ab2f3f..1c9c2a7c6 100644
--- 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>

From e929e3f741781547f26fca6610d6932e99faa930 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Fri, 18 Aug 2023 08:41:31 +0200
Subject: [PATCH 2/2] missed one

---
 powertools-e2e-tests/handlers/pom.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/powertools-e2e-tests/handlers/pom.xml b/powertools-e2e-tests/handlers/pom.xml
index 6e82c7aec..dcf8908e7 100644
--- 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>