This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a5f27ca1c30b98e35327b1cf215d077fe09a4f68 Author: Tichov Zoltán <[email protected]> AuthorDate: Sat May 14 21:13:14 2022 +0200 Translate the "https://jakarta.ee/xml/ns/jakartaee"; namespace to "http://java.sun.com/xml/ns/javaee"; --- .../src/main/java/org/apache/openejb/jee/JaxbJavaee.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java index ea4c405dc2..7b39e9e570 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java @@ -351,8 +351,11 @@ public class JaxbJavaee { } protected String eeUri(final String uri) { - // if ee 7 then switch back on ee 6 to not break compatibility - to rework surely when we'll be fully ee 7 - return "http://xmlns.jcp.org/xml/ns/javaee".equals(uri) ? "http://java.sun.com/xml/ns/javaee"; : uri; + // if ee 7 or jakarta ee then switch back on ee 6 to not break compatibility - to rework surely when we'll be fully ee 7 or jakarta ee + if ("http://xmlns.jcp.org/xml/ns/javaee".equals(uri) || "https://jakarta.ee/xml/ns/jakartaee".equals(uri)){ + return "http://java.sun.com/xml/ns/javaee";; + } + return uri; } @Override
