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
commit 7902f20d0b6b5aaf77f2440f73e083243ff2044e Author: Emmanuel Bourg <ebo...@apache.org> AuthorDate: Sat Jan 2 23:26:44 2021 +0100 Better formatting for the EESpecProfile regexps --- .../org/apache/tomcat/jakartaee/EESpecProfile.java | 36 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java index 3d3a097..da77667 100644 --- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java +++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java @@ -24,11 +24,39 @@ import java.util.regex.Pattern; */ public enum EESpecProfile { - TOMCAT("javax([/\\.](annotation(?![/\\.]processing)|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|websocket))"), + 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|" - + "xml[/\\.](bind|namespace|registry|rpc|soap|stream|ws|XMLConstants)))"); + 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" + + "|xml[/\\.](bind|namespace|registry|rpc|soap|stream|ws|XMLConstants)))"); private Pattern pattern; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org