This is an automated email from the ASF dual-hosted git repository.
ebourg 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 42be387 Exclude the packages which have not been migrated to the new
jakarta.* namespace: 'javax.annotation.processing' and 'javax.transaction.xa'
42be387 is described below
commit 42be3872611f26389ce4aa415c4b421acb680934
Author: Stephan Markwalder <[email protected]>
AuthorDate: Sun Apr 12 15:26:16 2020 +0200
Exclude the packages which have not been migrated to the new jakarta.*
namespace: 'javax.annotation.processing' and 'javax.transaction.xa'
---
src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java | 6 +++---
src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java | 4 ++++
2 files changed, 7 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 1eb6a41..bdf4889 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -24,10 +24,10 @@ import java.util.regex.Pattern;
*/
public enum EESpecProfile {
-
TOMCAT("javax([/\\.](annotation|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction|websocket))"),
+
TOMCAT("javax([/\\.](annotation(?![/\\.]processing)|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|websocket))"),
-
EE("javax([/\\.](activation|annotation|decorator|ejb|el|enterprise|json|interceptor|inject|mail|persistence|"
- +
"security[/\\.]auth[/\\.]message|servlet|transaction|validation|websocket|ws[/\\.]rs|"
+
EE("javax([/\\.](activation|annotation(?![/\\.]processing)|decorator|ejb|el|enterprise|json|interceptor|inject|mail|persistence|"
+ +
"security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
+
"xml[/\\.](bind|namespace|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
index bc88aaf..0eba27f 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -55,9 +55,11 @@ public class EESpecProfileTest {
assertEquals("javax.xml.XMLConstants",
profile.convert("javax.xml.XMLConstants"));
// non EE javax packages
+ assertEquals("javax.annotation.processing",
profile.convert("javax.annotation.processing"));
assertEquals("javax.security", profile.convert("javax.security"));
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"));
}
@Test
@@ -90,8 +92,10 @@ public class EESpecProfileTest {
assertEquals("jakarta.xml.XMLConstants",
profile.convert("javax.xml.XMLConstants"));
// non EE javax packages
+ assertEquals("javax.annotation.processing",
profile.convert("javax.annotation.processing"));
assertEquals("javax.security", profile.convert("javax.security"));
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"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
