[tomcat-jakartaee-migration] branch master updated: Convert the javax.jms package with the EE profile (Fixes #6). The previous fix c094325 targeted javax.jmx - Which is NOT touched by Jakarta EE it seems

[mgrigorov]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7d180b2  Convert the javax.jms package with the EE profile (Fixes #6). 
The previous fix c094325 targeted javax.jmx - Which is NOT touched by Jakarta 
EE it seems
     new 78287b2  Merge pull request #7 from alitokmen/master
7d180b2 is described below

commit 7d180b26db201ffd3e7b00c62ff73d7853eea6e6
Author: alitokmen <nos...@alishomepage.com>
AuthorDate: Wed Dec 30 07:42:57 2020 +0100

    Convert the javax.jms package with the EE profile (Fixes #6). The previous 
fix c094325 targeted javax.jmx - Which is NOT touched by Jakarta EE it seems
---
 src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java     | 2 +-
 src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java 
b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
index 32781c1..78d4103 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -26,7 +26,7 @@ public enum EESpecProfile {
 
     
TOMCAT("javax([/\\.](annotation(?![/\\.]processing)|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|websocket))"),
 
-    
EE("javax([/\\.](activation|annotation(?![/\\.]processing)|decorator|ejb|el|enterprise|jmx|json|interceptor|inject|mail|persistence|"
+    
EE("javax([/\\.](activation|annotation(?![/\\.]processing)|decorator|ejb|el|enterprise|jms|json|interceptor|inject|mail|persistence|"
                 + 
"security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
                 + 
"xml[/\\.](bind|namespace|rpc|soap|stream|ws|XMLConstants)))");
 
diff --git a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
index bab8010..1c97339 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -41,7 +41,7 @@ public class EESpecProfileTest {
         assertEquals("javax.activation", profile.convert("javax.activation"));
         assertEquals("javax.decorator", profile.convert("javax.decorator"));
         assertEquals("javax.enterprise", profile.convert("javax.enterprise"));
-        assertEquals("javax.jmx", profile.convert("javax.jmx"));
+        assertEquals("javax.jms", profile.convert("javax.jms"));
         assertEquals("javax.json", profile.convert("javax.json"));
         assertEquals("javax.interceptor", 
profile.convert("javax.interceptor"));
         assertEquals("javax.inject", profile.convert("javax.inject"));
@@ -73,7 +73,7 @@ public class EESpecProfileTest {
         assertEquals("jakarta.ejb", profile.convert("javax.ejb"));
         assertEquals("jakarta.el", profile.convert("javax.el"));
         assertEquals("jakarta.enterprise", 
profile.convert("javax.enterprise"));
-        assertEquals("jakarta.jmx", profile.convert("javax.jmx"));
+        assertEquals("jakarta.jms", profile.convert("javax.jms"));
         assertEquals("jakarta.json", profile.convert("javax.json"));
         assertEquals("jakarta.interceptor", 
profile.convert("javax.interceptor"));
         assertEquals("jakarta.inject", profile.convert("javax.inject"));


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