This is an automated email from the ASF dual-hosted git repository. deepak pushed a commit to branch OFBIZ-13286-rest-api-not-working in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit f83a4e07c71701bee1203fce9bd5538e4dffb9d2 Author: Deepak Dixit <[email protected]> AuthorDate: Wed Aug 20 18:52:53 2025 +0530 Upgraded Apache CXF from 3.6.4 to 4.1.3 to support Jakarta namespace --- dependencies.gradle | 2 +- .../base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java | 2 +- .../src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java | 2 +- .../security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java | 2 +- .../src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java | 2 +- .../src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java | 2 +- .../src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 66276afb1f..ba726ec72c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -61,7 +61,7 @@ dependencies { implementation 'org.apache.tika:tika-core:2.9.2' // To be compatible with tika-parser-pdf-module below implementation 'org.apache.tika:tika-parsers:2.9.2' // To be compatible with tika-parser-pdf-module below implementation 'org.apache.tika:tika-parser-pdf-module:2.9.2' // > 2.9.2 does not compile, see OFBIZ-13155 - implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.4' // 4.x+ requires javax.xml.bind -> jakarta.xml.bind namespace change + implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:4.1.3' implementation 'org.apache.tomcat:tomcat-catalina-ha:10.1.44' // Remember to change the version number (10 now) in javadoc block if needed. implementation 'org.apache.tomcat:tomcat-jasper:10.1.44' implementation 'org.apache.axis2:axis2-kernel:1.8.2' diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java index 887db984db..556f4067a9 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java @@ -40,7 +40,7 @@ import java.util.Map; import java.util.function.Predicate; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.hamcrest.Matchers; import org.junit.Before; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java index 9700d08f22..5581c76f26 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java @@ -44,7 +44,7 @@ import java.util.TreeSet; import java.util.Vector; import java.util.WeakHashMap; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import javax.xml.parsers.ParserConfigurationException; import org.apache.ofbiz.base.util.Debug; diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java index 66331da6fc..8849b77dc6 100644 --- a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java +++ b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; -import javax.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedHashMap; import org.apache.commons.lang.StringUtils; import org.apache.cxf.jaxrs.model.URITemplate; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java index 14d1a32111..2c6406b6a6 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java @@ -26,7 +26,7 @@ import java.util.Map; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java index 7b462bf633..d7966c4c7d 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java @@ -42,7 +42,7 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; -import javax.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedHashMap; import org.apache.cxf.jaxrs.model.URITemplate; import org.apache.ofbiz.base.location.FlexibleLocation; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java index 093f1a1f3e..039177e984 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java @@ -26,7 +26,7 @@ import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.ofbiz.entity.util.EntityUtilProperties;
