This is an automated email from the ASF dual-hosted git repository.

dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git

commit dad7e8d342b528b32d1f0f19ba56f7b9cd93dc96
Author: David Blevins <[email protected]>
AuthorDate: Sat Jun 13 13:50:56 2020 -0700

    Fix serlvet type and references to javax.transaction
---
 .../src/main/java/org/apache/tomee/patch/core/Transformation.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git 
a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
 
b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index cc31b39..8da04f9 100644
--- 
a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ 
b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -140,6 +140,7 @@ public class Transformation {
         if (path.endsWith("META-INF/DEPENDENCIES")) return true;
         if (path.endsWith("META-INF/dependencies.xml")) return true;
         if (path.endsWith("changelog.html")) return true;
+        if (path.endsWith("RELEASE-NOTES.txt")) return true;
         if (path.endsWith("pom.xml")) return true;
         return false;
     }
@@ -154,6 +155,11 @@ public class Transformation {
         }
 
         inputStream = StreamBuilder.create(inputStream)
+                .replace("javax.jsp", "jakarta.servlet.jsp")
+                .replace("serlvet", "servlet")
+                .replace("javax.transaction.TransactionManager", 
"jakarta.transaction.TransactionManager")
+                .replace("javax.transaction.Transaction", 
"jakarta.transaction.Transaction")
+                .replace("javax.annotation.Resource", 
"jakarta.annotation.Resource")
                 .replace("javax.activation", "jakarta.activation")
                 .replace("javax.batch", "jakarta.batch")
                 .replace("javax.decorator", "jakarta.decorator")

Reply via email to