[tomcat-jakartaee-migration] 02/02: Exclude packages from migration that are part of Java SE.

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 5f47a4f3c731ffd9a7a28defdd16a482b651d4df
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 10 15:11:16 2021 +0000

    Exclude packages from migration that are part of Java SE.
---
 CHANGES.md                                                       | 1 +
 src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java     | 2 +-
 src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 386e5b8..baeffb2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,6 +25,7 @@
 - Fix [#13](https://github.com/apache/tomcat-jakartaee-migration/issues/13). 
Refactor mapping of log messages to log levels. (markt)
 - Fix [#3](https://github.com/apache/tomcat-jakartaee-migration/issues/3). Add 
support for excluding files from conversion. (markt)
 - Fix handling of classes with more than 32768 entries in the constant pool. 
(markt)
+- Exclude `javax.xml.stream` and `javax.xml.XMLConstants` from the EE profile. 
(markt)
 
 ## 0.1.0
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java 
b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
index 128c1a6..89b4a09 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -57,7 +57,7 @@ public enum EESpecProfile {
             "|validation" +
             "|websocket" +
             "|ws[/\\.]rs" +
-            "|xml[/\\.](bind|registry|rpc|soap|stream|ws|XMLConstants)))");
+            "|xml[/\\.](bind|registry|rpc|soap|ws)))");
 
     private Pattern pattern;
 
diff --git a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
index ae21b36..351cf6c 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -58,9 +58,7 @@ public class EESpecProfileTest {
         assertEquals("javax.xml.rpc", profile.convert("javax.xml.rpc"));
         assertEquals("javax.xml.registry", 
profile.convert("javax.xml.registry"));
         assertEquals("javax.xml.soap", profile.convert("javax.xml.soap"));
-        assertEquals("javax.xml.stream", profile.convert("javax.xml.stream"));
         assertEquals("javax.xml.ws", profile.convert("javax.xml.ws"));
-        assertEquals("javax.xml.XMLConstants", 
profile.convert("javax.xml.XMLConstants"));
 
         // non EE javax packages
         assertEquals("javax.annotation.processing", 
profile.convert("javax.annotation.processing"));
@@ -69,8 +67,10 @@ public class EESpecProfileTest {
         assertEquals("javax.security.auth", 
profile.convert("javax.security.auth"));
         assertEquals("javax.swing", profile.convert("javax.swing"));
         assertEquals("javax.transaction.xa", 
profile.convert("javax.transaction.xa"));
+        assertEquals("javax.xml.stream", profile.convert("javax.xml.stream"));
         assertEquals("javax.xml.namespace", 
profile.convert("javax.xml.namespace"));
         assertEquals("javax.xml.xpath.XPathConstants", 
profile.convert("javax.xml.xpath.XPathConstants"));
+        assertEquals("javax.xml.XMLConstants", 
profile.convert("javax.xml.XMLConstants"));
     }
 
     @Test
@@ -106,9 +106,7 @@ public class EESpecProfileTest {
         assertEquals("jakarta.xml.registry", 
profile.convert("javax.xml.registry"));
         assertEquals("jakarta.xml.rpc", profile.convert("javax.xml.rpc"));
         assertEquals("jakarta.xml.soap", profile.convert("javax.xml.soap"));
-        assertEquals("jakarta.xml.stream", 
profile.convert("javax.xml.stream"));
         assertEquals("jakarta.xml.ws", profile.convert("javax.xml.ws"));
-        assertEquals("jakarta.xml.XMLConstants", 
profile.convert("javax.xml.XMLConstants"));
 
         // non EE javax packages
         assertEquals("javax.annotation.processing", 
profile.convert("javax.annotation.processing"));
@@ -117,7 +115,9 @@ public class EESpecProfileTest {
         assertEquals("javax.security.auth", 
profile.convert("javax.security.auth"));
         assertEquals("javax.swing", profile.convert("javax.swing"));
         assertEquals("javax.transaction.xa", 
profile.convert("javax.transaction.xa"));
+        assertEquals("javax.xml.stream", profile.convert("javax.xml.stream"));
         assertEquals("javax.xml.namespace", 
profile.convert("javax.xml.namespace"));
         assertEquals("javax.xml.xpath.XPathConstants", 
profile.convert("javax.xml.xpath.XPathConstants"));
+        assertEquals("javax.xml.XMLConstants", 
profile.convert("javax.xml.XMLConstants"));
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org