Extend the fix for issue #6 to also include the javax.sql package

apache · Dec 31, 2020 · 6e653c9 · 6e653c9
1 parent d35a385
commit 6e653c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -27,7 +27,7 @@ public enum EESpecProfile {
     TOMCAT("javax([/\\.](annotation(?![/\\.]processing)|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|websocket))"),
 
     EE("javax([/\\.](activation|annotation(?![/\\.]processing)|batch|decorator|ejb|el|enterprise|faces|jms|json|jws|interceptor|inject|mail|persistence|"
-                + "resource|security[/\\.](auth[/\\.]message|enterprise|jacc)|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
+                + "resource|security[/\\.](auth[/\\.]message|enterprise|jacc)|servlet|sql|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
                 + "xml[/\\.](bind|namespace|registry|rpc|soap|stream|ws|XMLConstants)))");
 
     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
@@ -51,6 +51,7 @@ public void testProfileTomcat() {
         assertEquals("javax.resource", profile.convert("javax.resource"));
         assertEquals("javax.security.enterprise", profile.convert("javax.security.enterprise"));
         assertEquals("javax.security.jacc", profile.convert("javax.security.jacc"));
+        assertEquals("javax.sql", profile.convert("javax.sql"));
         assertEquals("javax.validation", profile.convert("javax.validation"));
         assertEquals("javax.ws.rs", profile.convert("javax.ws.rs"));
         assertEquals("javax.xml.bind", profile.convert("javax.xml.bind"));
@@ -94,6 +95,7 @@ public void testProfileEE() {
         assertEquals("jakarta.security.enterprise", profile.convert("javax.security.enterprise"));
         assertEquals("jakarta.security.jacc", profile.convert("javax.security.jacc"));
         assertEquals("jakarta.servlet", profile.convert("javax.servlet"));
+        assertEquals("jakarta.sql", profile.convert("javax.sql"));
         assertEquals("jakarta.transaction", profile.convert("javax.transaction"));
         assertEquals("jakarta.validation", profile.convert("javax.validation"));
         assertEquals("jakarta.websocket", profile.convert("javax.websocket"));